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

Move the job of creating userActivity to AtomApplication

Browse source
This commit is contained in:
Cheng Zhao 2016-05-05 16:38:47 +09:00
parent 60bd60e1ed
commit 2f9fee0c8a
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/browser_mac.mm
View file

@ -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(