Merge pull request nwjs#1053 from ywkim/app-reopen-event

rogerwang · rogerwang · commit b36c6022e359 · 2013-09-09T20:08:18.000-07:00
[Mac] Add app 'reopen' event
diff --git a/AUTHORS b/AUTHORS
@@ -19,3 +19,4 @@ Zhang Chaobin <zhchbin@gmail.com>
 Michael Morrison <mmorrison@wootalyzer.com>
 William Towe <willbur1984@gmail.com>
 Toni Lähdekorpi <toni@lygon.net>
+Youngwook Kim <youngwook.kim@gmail.com>
diff --git a/src/api/api_messages.h b/src/api/api_messages.h
@@ -92,6 +92,9 @@ IPC_MESSAGE_ROUTED1(ShellViewHostMsg_UpdateDraggableRegions,
 IPC_MESSAGE_CONTROL1(ShellViewMsg_Open,
                      std::string /* file name */)
 
+// Tell browser we have to reopen.
+IPC_MESSAGE_CONTROL0(ShellViewMsg_Reopen)
+
 // clear cache on the renderer side
 IPC_MESSAGE_CONTROL0(ShellViewMsg_ClearCache)
 
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -186,6 +186,20 @@ void App::EmitOpenEvent(const std::string& path) {
   }
 }
 
+// static
+void App::EmitReopenEvent() {
+  std::set<RenderProcessHost*> rphs;
+  std::set<RenderProcessHost*>::iterator it;
+
+  GetRenderProcessHosts(rphs);
+  for (it = rphs.begin(); it != rphs.end(); it++) {
+    RenderProcessHost* rph = *it;
+    DCHECK(rph != NULL);
+
+    rph->Send(new ShellViewMsg_Reopen());
+  }
+}
+
 void App::ClearCache(content::RenderProcessHost* render_process_host) {
   render_process_host->Send(new ShellViewMsg_ClearCache());
   nw::RemoveHttpDiskCache(render_process_host->GetBrowserContext(),
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -55,6 +55,10 @@ class App {
   // Post "open" event.
   static void EmitOpenEvent(const std::string& path);
 
+  // Post "reopen" event.
+  // (This event is received when the user clicked the icon in the Dock).
+  static void EmitReopenEvent();
+
   static void ClearCache(content::RenderProcessHost* render_view_host);
  private:
   App();
diff --git a/src/browser/app_controller_mac.mm b/src/browser/app_controller_mac.mm
@@ -69,4 +69,10 @@ - (void) applicationDidFinishLaunching: (NSNotification *) note {
   standard_menus.BuildWindowMenu();
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication
+                    hasVisibleWindows:(BOOL)flag {
+  api::App::EmitReopenEvent();
+  return YES;
+}
+
 @end
diff --git a/src/renderer/shell_render_process_observer.cc b/src/renderer/shell_render_process_observer.cc
@@ -50,6 +50,7 @@ bool ShellRenderProcessObserver::OnControlMessageReceived(
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ShellRenderProcessObserver, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_Open, OnOpen)
+    IPC_MESSAGE_HANDLER(ShellViewMsg_Reopen, OnReopen)
     IPC_MESSAGE_HANDLER(ShellViewMsg_ClearCache, OnClearCache)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -88,6 +89,25 @@ void ShellRenderProcessObserver::OnOpen(const std::string& path) {
   }
 }
 
+void ShellRenderProcessObserver::OnReopen() {
+  v8::HandleScope handle_scope;
+
+  // the App object is stored in process["_nw_app"].
+  v8::Local<v8::Object> process = node::g_context->Global()->Get(
+      node::process_symbol)->ToObject();
+  v8::Local<v8::String> app_symbol = v8::String::NewSymbol("_nw_app");
+  if (process->Has(app_symbol)) {
+    // process["_nw_app"].emit(path).
+    v8::Local<v8::Object> app = process->Get(app_symbol)->ToObject();
+    v8::Local<v8::Function> emit = v8::Local<v8::Function>::Cast(
+        app->Get(v8::String::New("emit")));
+    v8::Local<v8::Value> argv[] = {
+        v8::String::New("reopen")
+    };
+    emit->Call(app, 1, argv);
+  }
+}
+
 void ShellRenderProcessObserver::OnClearCache() {
   if (webkit_initialized_)
     WebKit::WebCache::clear();
diff --git a/src/renderer/shell_render_process_observer.h b/src/renderer/shell_render_process_observer.h
@@ -40,6 +40,7 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
   virtual void WebKitInitialized() OVERRIDE;
  private:
   void OnOpen(const std::string& path);
+  void OnReopen();
   void OnClearCache();
 
   bool webkit_initialized_;
