Style fixes

atom/browser/api/atom_api_app.cc

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

atom/browser/browser_mac.mm

@@ -150,18 +150,18 @@ void Browser::InvalidateCurrentActivity() {
 
 void Browser::UpdateCurrentActivity(const std::string& type,
                                     const base::DictionaryValue& user_info) {
-  [[AtomApplication sharedApplication] 
+  [[AtomApplication sharedApplication]
       updateCurrentActivity:base::SysUTF8ToNSString(type)
                withUserInfo:DictionaryValueToNSDictionary(user_info)];
 }
 
 bool Browser::WillContinueUserActivity(const std::string& type) {
   bool prevent_default = false;
-    for (BrowserObserver& observer : observers_)
+  for (BrowserObserver& observer : observers_)
-      observer.OnWillContinueUserActivity(&prevent_default, type);
+    observer.OnWillContinueUserActivity(&prevent_default, type);
   return prevent_default;
 }
- 
+
 void Browser::DidFailToContinueUserActivity(const std::string& type,
                                             const std::string& error) {
   for (BrowserObserver& observer : observers_)
@@ -175,7 +175,7 @@ bool Browser::ContinueUserActivity(const std::string& type,
     observer.OnContinueUserActivity(&prevent_default, type, user_info);
   return prevent_default;
 }
-  
+
 void Browser::UserActivityWasContinued(const std::string& type,
                                        const base::DictionaryValue& user_info) {
   for (BrowserObserver& observer : observers_)

atom/browser/mac/atom_application.h

@@ -11,7 +11,7 @@
  @private
   BOOL handlingSendEvent_;
   base::scoped_nsobject<NSUserActivity> currentActivity_;
-  NSCondition *handoffLock_;
+  NSCondition* handoffLock_;
   BOOL updateReceived_;
 }
 
@@ -28,7 +28,7 @@
               withUserInfo:(NSDictionary*)userInfo
             withWebpageURL:(NSURL*)webpageURL;
 - (void)invalidateCurrentActivity;
-- (void)updateCurrentActivity:(NSString *)type
+- (void)updateCurrentActivity:(NSString*)type
                  withUserInfo:(NSDictionary*)userInfo;
 
 @end

atom/browser/mac/atom_application.mm

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

atom/browser/mac/atom_application_delegate.mm

@@ -118,17 +118,17 @@ continueUserActivity:(NSUserActivity*)userActivity
   return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
 }
 
-- (BOOL)application:(NSApplication *)application willContinueUserActivityWithType:(NSString *)userActivityType {
+- (BOOL)application:(NSApplication*)application willContinueUserActivityWithType:(NSString*)userActivityType {
   std::string activity_type(base::SysNSStringToUTF8(userActivityType));
-  
+
   atom::Browser* browser = atom::Browser::Get();
   return browser->WillContinueUserActivity(activity_type) ? YES : NO;
 }
 
-- (void)application:(NSApplication *)application didFailToContinueUserActivityWithType:(NSString *)userActivityType error:(NSError *)error {
+- (void)application:(NSApplication*)application didFailToContinueUserActivityWithType:(NSString*)userActivityType error:(NSError*)error {
   std::string activity_type(base::SysNSStringToUTF8(userActivityType));
   std::string error_message(base::SysNSStringToUTF8([error localizedDescription]));
-  
+
   atom::Browser* browser = atom::Browser::Get();
   browser->DidFailToContinueUserActivity(activity_type, error_message);
 }