Move the job of creating userActivity to AtomApplication
This commit is contained in:
parent
60bd60e1ed
commit
2f9fee0c8a
3 changed files with 12 additions and 12 deletions
|
@ -91,19 +91,15 @@ void Browser::SetAppUserModelID(const base::string16& name) {
|
||||||
void Browser::SetUserActivity(
|
void Browser::SetUserActivity(
|
||||||
const std::string& type,
|
const std::string& type,
|
||||||
const base::DictionaryValue& user_info) {
|
const base::DictionaryValue& user_info) {
|
||||||
NSString* nstype = [NSString stringWithUTF8String:type.c_str()];
|
[[AtomApplication sharedApplication]
|
||||||
NSUserActivity* userActivity =
|
setCurrentActivity:base::SysUTF8ToNSString(type)
|
||||||
[[NSUserActivity alloc] initWithActivityType:nstype];
|
withUserInfo:DictionaryValueToNSDictionary(user_info)];
|
||||||
userActivity.userInfo = DictionaryValueToNSDictionary(user_info);
|
|
||||||
[userActivity becomeCurrent];
|
|
||||||
|
|
||||||
[[AtomApplication sharedApplication] setCurrentActivity:userActivity];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Browser::GetCurrentActivityType() {
|
std::string Browser::GetCurrentActivityType() {
|
||||||
NSUserActivity* user_activity =
|
NSUserActivity* userActivity =
|
||||||
[[AtomApplication sharedApplication] getCurrentActivity];
|
[[AtomApplication sharedApplication] getCurrentActivity];
|
||||||
return base::SysNSStringToUTF8(user_activity.activityType);
|
return base::SysNSStringToUTF8(userActivity.activityType);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Browser::ContinueUserActivity(
|
bool Browser::ContinueUserActivity(
|
||||||
|
|
|
@ -21,6 +21,6 @@
|
||||||
- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
|
- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
|
||||||
|
|
||||||
- (NSUserActivity*)getCurrentActivity;
|
- (NSUserActivity*)getCurrentActivity;
|
||||||
- (void)setCurrentActivity:(NSUserActivity*)userActivity;
|
- (void)setCurrentActivity:(NSString*)type withUserInfo:(NSDictionary*)userInfo;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -28,8 +28,12 @@
|
||||||
handlingSendEvent_ = handlingSendEvent;
|
handlingSendEvent_ = handlingSendEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setCurrentActivity:(NSUserActivity*)userActivity {
|
- (void)setCurrentActivity:(NSString*)type
|
||||||
currentActivity_ = base::scoped_nsobject<NSUserActivity>(userActivity);
|
withUserInfo:(NSDictionary*)userInfo {
|
||||||
|
currentActivity_ = base::scoped_nsobject<NSUserActivity>(
|
||||||
|
[[NSUserActivity alloc] initWithActivityType:type]);
|
||||||
|
[currentActivity_ setUserInfo:userInfo];
|
||||||
|
[currentActivity_ becomeCurrent];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSUserActivity*)getCurrentActivity {
|
- (NSUserActivity*)getCurrentActivity {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue