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

Send notification userInfo to app.ready, on macOS.

Browse source 
Check if the user launched the app from a notification and send the notification args across if so.
This commit is contained in:
Charlie Hess 2016-08-31 17:17:44 -07:00
parent a37544cef4
commit af9e010162
7 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/mac/atom_application_delegate.mm
View file

@ -25,7 +25,16 @@
}
- (void)applicationDidFinishLaunching:(NSNotification*)notify {
atom::Browser::Get()->DidFinishLaunching();
NSUserNotification *user_notification = [notify userInfo][(id)@"NSApplicationLaunchUserNotificationKey"];
if (user_notification.userInfo != nil) {
std::unique_ptr<base::DictionaryValue> launch_info =
atom::NSDictionaryToDictionaryValue(user_notification.userInfo);
atom::Browser::Get()->DidFinishLaunching(*launch_info);
} else {
base::DictionaryValue* launch_info = new base::DictionaryValue();
atom::Browser::Get()->DidFinishLaunching(*launch_info);
}
}
- (NSMenu*)applicationDockMenu:(NSApplication*)sender {
@ -64,7 +73,7 @@ continueUserActivity:(NSUserActivity*)userActivity
restorationHandler:(void (^)(NSArray*restorableObjects))restorationHandler {
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
std::unique_ptr<base::DictionaryValue> user_info =
atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
if (!user_info)
return NO;