Merge pull request nwjs#1769 from ribrain/master

rogerwang · rogerwang · commit 4c1d34ec4974 · 2015-01-22T07:15:30.000+08:00
Fix for issue 934: added URL scheme support for MAC.
diff --git a/src/browser/app_controller_mac.h b/src/browser/app_controller_mac.h
@@ -24,7 +24,11 @@
 #import <Cocoa/Cocoa.h>
 
 @interface AppController : NSObject<NSApplicationDelegate> {
+	BOOL appReady;
 }
+
+@property(nonatomic) BOOL appReady;
+
 @end
 
 #endif  // CONTENT_NW_SRC_BROWSER_APP_CONTROLLER_MAC_H_
diff --git a/src/browser/app_controller_mac.mm b/src/browser/app_controller_mac.mm
@@ -31,6 +31,8 @@
 
 @implementation AppController
 
+@synthesize appReady;
+
 - (BOOL)application:(NSApplication*)sender
            openFile:(NSString*)filename {
   if (content::Shell::windows().size() == 0) {
@@ -52,6 +54,15 @@ - (BOOL)application:(NSApplication*)sender
   return FALSE;
 }
 
+- (void) applicationWillFinishLaunching: (NSNotification *) note {
+	self.appReady = FALSE;
+	NSAppleEventManager *eventManager = [NSAppleEventManager sharedAppleEventManager];
+	[eventManager setEventHandler:self
+					  andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+					forEventClass:kInternetEventClass
+					   andEventID:kAEGetURL];
+}
+
 - (void) applicationDidFinishLaunching: (NSNotification *) note {
   // Initlialize everything here
   content::ShellContentBrowserClient* browser_client = 
@@ -74,6 +85,7 @@ - (void) applicationDidFinishLaunching: (NSNotification *) note {
     standard_menus.BuildEditMenu();
   standard_menus.BuildWindowMenu();
 #endif
+	self.appReady = TRUE;
 }
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication
@@ -82,6 +94,22 @@ - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication
   return YES;
 }
 
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+	NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
+	if (self.appReady) {
+		// Immediate handle of get url event
+		nwapi::App::EmitOpenEvent([urlString UTF8String]);
+	} else {
+		// App is not ready yet, add the URL to the command line arguments.
+		// This happens when the app is started by opening a link with the registered URL.
+		if (content::Shell::windows().size() == 0) {
+			CommandLine::ForCurrentProcess()->AppendArg([urlString UTF8String]);
+			CommandLine::ForCurrentProcess()->FixOrigArgv4Finder([urlString UTF8String]);
+		}
+	}
+}
+
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)app {
   // The termination procedure is completely and gracefully handled by node-webkit
   // (triggered by CloseAllWindows, app exits when last window closes) so we
