mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Style fixes

Browse source
This commit is contained in:
Cheng Zhao 2017-09-14 16:12:34 +09:00
parent 33dd5e26fb
commit ff023115f5
5 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_app.cc
View file

@ -589,28 +589,33 @@ void App::OnWillContinueUserActivity(
const std::string& type) { const std::string& type) {
*prevent_default = Emit("will-continue-activity", type); *prevent_default = Emit("will-continue-activity", type);
} }
void App::OnDidFailToContinueUserActivity( void App::OnDidFailToContinueUserActivity(
const std::string& type, const std::string& type,
const std::string& error) { const std::string& error) {
Emit("continue-activity-error", type, error); Emit("continue-activity-error", type, error);
} }
void App::OnContinueUserActivity( void App::OnContinueUserActivity(
bool* prevent_default, bool* prevent_default,
const std::string& type, const std::string& type,
const base::DictionaryValue& user_info) { const base::DictionaryValue& user_info) {
*prevent_default = Emit("continue-activity", type, user_info); *prevent_default = Emit("continue-activity", type, user_info);
} }
void App::OnUserActivityWasContinued( void App::OnUserActivityWasContinued(
const std::string& type, const std::string& type,
const base::DictionaryValue& user_info) { const base::DictionaryValue& user_info) {
Emit("activity-was-continued", type, user_info); Emit("activity-was-continued", type, user_info);
} }
void App::OnUpdateUserActivityState( void App::OnUpdateUserActivityState(
bool* prevent_default, bool* prevent_default,
const std::string& type, const std::string& type,
const base::DictionaryValue& user_info) { const base::DictionaryValue& user_info) {
*prevent_default = Emit("update-activity-state", type, user_info); *prevent_default = Emit("update-activity-state", type, user_info);
} }
void App::OnNewWindowForTab() { void App::OnNewWindowForTab() {
Emit("new-window-for-tab"); Emit("new-window-for-tab");
} }

24
atom/browser/mac/atom_application.mm
View file

@ -10,13 +10,16 @@
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_accessibility_state.h"
static inline void dispatch_sync_main(dispatch_block_t block) { namespace {
if ([NSThread isMainThread]) {
inline void dispatch_sync_main(dispatch_block_t block) {
if ([NSThread isMainThread])
block(); block();
} else { else
dispatch_sync(dispatch_get_main_queue(), block); dispatch_sync(dispatch_get_main_queue(), block);
} }
}
} // namespace
@implementation AtomApplication @implementation AtomApplication
@ -54,16 +57,16 @@ static inline void dispatch_sync_main(dispatch_block_t block) {
} }
- (void)invalidateCurrentActivity { - (void)invalidateCurrentActivity {
if (currentActivity_.get() != NULL) { if (currentActivity_) {
[currentActivity_.get() invalidate]; [currentActivity_ invalidate];
currentActivity_.reset(); currentActivity_.reset();
} }
} }
- (void)updateCurrentActivity:(NSString*)type - (void)updateCurrentActivity:(NSString*)type
withUserInfo:(NSDictionary*)userInfo { withUserInfo:(NSDictionary*)userInfo {
if (currentActivity_.get() != NULL) { if (currentActivity_) {
[currentActivity_.get() addUserInfoEntriesFromDictionary:userInfo]; [currentActivity_ addUserInfoEntriesFromDictionary:userInfo];
} }
[handoffLock_ lock]; [handoffLock_ lock];
@ -73,9 +76,7 @@ static inline void dispatch_sync_main(dispatch_block_t block) {
} }
- (void)userActivityWillSave:(NSUserActivity *)userActivity { - (void)userActivityWillSave:(NSUserActivity *)userActivity {
__block BOOL shouldWait = NO; __block BOOL shouldWait = NO;
dispatch_sync_main(^{ dispatch_sync_main(^{
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType)); std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info = std::unique_ptr<base::DictionaryValue> user_info =
@ -90,7 +91,7 @@ static inline void dispatch_sync_main(dispatch_block_t block) {
updateReceived_ = NO; updateReceived_ = NO;
while (!updateReceived_) { while (!updateReceived_) {
BOOL isSignaled = [handoffLock_ waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]]; BOOL isSignaled = [handoffLock_ waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
if (!isSignaled) { break; } if (!isSignaled) break;
} }
[handoffLock_ unlock]; [handoffLock_ unlock];
} }
@ -105,7 +106,6 @@ static inline void dispatch_sync_main(dispatch_block_t block) {
atom::NSDictionaryToDictionaryValue(userActivity.userInfo); atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
atom::Browser* browser = atom::Browser::Get(); atom::Browser* browser = atom::Browser::Get();
browser->UserActivityWasContinued(activity_type, *user_info); browser->UserActivityWasContinued(activity_type, *user_info);
}); });
[userActivity setNeedsSave:YES]; [userActivity setNeedsSave:YES];