Exposes more Handoff related APIs to Electron.

atom/browser/mac/atom_application.h

@@ -6,7 +6,8 @@
 #import "base/mac/scoped_nsobject.h"
 
 @interface AtomApplication : NSApplication<CrAppProtocol,
-                                           CrAppControlProtocol> {
+                                           CrAppControlProtocol,
+                                           NSUserActivityDelegate> {
  @private
   BOOL handlingSendEvent_;
   base::scoped_nsobject<NSUserActivity> currentActivity_;
@@ -24,5 +25,8 @@
 - (void)setCurrentActivity:(NSString*)type
               withUserInfo:(NSDictionary*)userInfo
             withWebpageURL:(NSURL*)webpageURL;
+- (void)invalidateCurrentActivity;
+- (void)updateCurrentActivity:(NSString *)type
+                 withUserInfo:(NSDictionary*)userInfo;
 
 @end

atom/browser/mac/atom_application.mm

@@ -4,6 +4,7 @@
 
 #import "atom/browser/mac/atom_application.h"
 
+#include "atom/browser/mac/dict_util.h"
 #include "atom/browser/browser.h"
 #include "base/auto_reset.h"
 #include "base/strings/sys_string_conversions.h"
@@ -35,6 +36,7 @@
       [[NSUserActivity alloc] initWithActivityType:type]);
   [currentActivity_ setUserInfo:userInfo];
   [currentActivity_ setWebpageURL:webpageURL];
+  [currentActivity_ setDelegate: self];
   [currentActivity_ becomeCurrent];
 }
 
@@ -42,6 +44,42 @@
   return currentActivity_.get();
 }
 
+- (void)invalidateCurrentActivity {
+  if (currentActivity_.get() != NULL) {
+    [currentActivity_.get() invalidate];
+    currentActivity_.reset();
+  }
+}
+
+- (void)updateCurrentActivity:(NSString *)type
+                 withUserInfo:(NSDictionary*)userInfo {
+  if (currentActivity_.get() != NULL) {
+    [currentActivity_.get() addUserInfoEntriesFromDictionary:userInfo];
+  }
+}
+
+- (void)updateUserActivityState:(NSUserActivity *)userActivity {
+  std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
+  std::unique_ptr<base::DictionaryValue> user_info =
+    atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
+
+  atom::Browser* browser = atom::Browser::Get();
+  browser->UpdateUserActivityState(activity_type, *user_info);
+  
+  [super updateUserActivityState:userActivity];
+}
+
+- (void)userActivityWasContinued:(NSUserActivity *)userActivity {
+  std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
+  std::unique_ptr<base::DictionaryValue> user_info =
+    atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
+
+  atom::Browser* browser = atom::Browser::Get();
+
+  browser->UserActivityWasContinued(activity_type, *user_info);
+  [userActivity setNeedsSave:YES];
+}
+
 - (void)awakeFromNib {
   [[NSAppleEventManager sharedAppleEventManager]
       setEventHandler:self

atom/browser/mac/atom_application_delegate.mm

@@ -118,6 +118,21 @@ continueUserActivity:(NSUserActivity*)userActivity
   return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
 }
 
+- (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 {
+  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);
+}
+
 - (IBAction)newWindowForTab:(id)sender {
   atom::Browser::Get()->NewWindowForTab();
 }