From 2f9fee0c8a098fe8afdfa4bc58644b10ffe679be Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 5 May 2016 16:38:47 +0900
Subject: [PATCH] Move the job of creating userActivity to AtomApplication

---
 atom/browser/browser_mac.mm          | 14 +++++---------
 atom/browser/mac/atom_application.h  |  2 +-
 atom/browser/mac/atom_application.mm |  8 ++++++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index bb4cd2d..eb7191b 100644
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -91,19 +91,15 @@ void Browser::SetAppUserModelID(const base::string16& name) {
 void Browser::SetUserActivity(
     const std::string& type,
     const base::DictionaryValue& user_info) {
-  NSString* nstype = [NSString stringWithUTF8String:type.c_str()];
-  NSUserActivity* userActivity =
-      [[NSUserActivity alloc] initWithActivityType:nstype];
-  userActivity.userInfo = DictionaryValueToNSDictionary(user_info);
-  [userActivity becomeCurrent];
-
-  [[AtomApplication sharedApplication] setCurrentActivity:userActivity];
+  [[AtomApplication sharedApplication]
+      setCurrentActivity:base::SysUTF8ToNSString(type)
+            withUserInfo:DictionaryValueToNSDictionary(user_info)];
 }
 
 std::string Browser::GetCurrentActivityType() {
-  NSUserActivity* user_activity =
+  NSUserActivity* userActivity =
       [[AtomApplication sharedApplication] getCurrentActivity];
-  return base::SysNSStringToUTF8(user_activity.activityType);
+  return base::SysNSStringToUTF8(userActivity.activityType);
 }
 
 bool Browser::ContinueUserActivity(
diff --git a/atom/browser/mac/atom_application.h b/atom/browser/mac/atom_application.h
index 8f52ef1..e6489b7 100644
--- a/atom/browser/mac/atom_application.h
+++ b/atom/browser/mac/atom_application.h
@@ -21,6 +21,6 @@
 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
 
 - (NSUserActivity*)getCurrentActivity;
-- (void)setCurrentActivity:(NSUserActivity*)userActivity;
+- (void)setCurrentActivity:(NSString*)type withUserInfo:(NSDictionary*)userInfo;
 
 @end
diff --git a/atom/browser/mac/atom_application.mm b/atom/browser/mac/atom_application.mm
index 1811511..fa91836 100644
--- a/atom/browser/mac/atom_application.mm
+++ b/atom/browser/mac/atom_application.mm
@@ -28,8 +28,12 @@
   handlingSendEvent_ = handlingSendEvent;
 }
 
-- (void)setCurrentActivity:(NSUserActivity*)userActivity {
-  currentActivity_ = base::scoped_nsobject<NSUserActivity>(userActivity);
+- (void)setCurrentActivity:(NSString*)type
+              withUserInfo:(NSDictionary*)userInfo {
+  currentActivity_ = base::scoped_nsobject<NSUserActivity>(
+      [[NSUserActivity alloc] initWithActivityType:type]);
+  [currentActivity_ setUserInfo:userInfo];
+  [currentActivity_ becomeCurrent];
 }
 
 - (NSUserActivity*)getCurrentActivity {
-- 
2.7.4