github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

2
atom/browser/mac/atom_application.h
View File

@@ -21,6 +21,6 @@
- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
- (NSUserActivity*)getCurrentActivity;
- (void)setCurrentActivity:(NSUserActivity*)userActivity;
- (void)setCurrentActivity:(NSString*)type withUserInfo:(NSDictionary*)userInfo;
@end

8
atom/browser/mac/atom_application.mm
View File

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