don't force close remote instance with Node support

rogerwang · rogerwang · commit 6baf3a81049f · 2014-04-15T21:35:48.000+08:00
Still use the 'close' event; Bind Window object on opening Remote window with normal frame is still force closed Fix nwjs#1778
diff --git a/src/api/api_messages.h b/src/api/api_messages.h
@@ -100,3 +100,5 @@ IPC_MESSAGE_CONTROL0(ShellViewMsg_ClearCache)
 
 IPC_SYNC_MESSAGE_ROUTED0_1(ShellViewHostMsg_AllocateId, int)
 
+IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_SetForceClose, bool, int)
+
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -114,6 +114,7 @@ bool DispatcherHost::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_GetShellId, OnGetShellId);
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_CreateShell, OnCreateShell);
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_AllocateId, OnAllocateId);
+    IPC_MESSAGE_HANDLER(ShellViewHostMsg_SetForceClose, OnSetForceClose);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -272,17 +273,14 @@ void DispatcherHost::OnCreateShell(const std::string& url,
   WebContents* web_contents = content::WebContentsImpl::CreateWithOpener(
       create_params,
       static_cast<content::WebContentsImpl*>(base_web_contents));
-  content::Shell* new_shell =
-    content::Shell::Create(base_web_contents,
+
+  content::Shell::Create(base_web_contents,
                            GURL(url),
                            new_manifest.get(),
                            web_contents);
 
   if (new_renderer) {
     browser_context->set_pinning_renderer(true);
-    // since the new-instance shell is always bound
-    // there would be 'Close' event cannot reach dest
-    new_shell->set_force_close(true);
   }
 
   *routing_id = web_contents->GetRoutingID();
@@ -298,4 +296,11 @@ void DispatcherHost::OnAllocateId(int * ret) {
   *ret = AllocateId();
 }
 
+void DispatcherHost::OnSetForceClose(bool force, int* ret) {
+  content::Shell* shell =
+      content::Shell::FromRenderViewHost(render_view_host());
+  shell->set_force_close(force);
+  *ret = 0;
+}
+
 }  // namespace nwapi
diff --git a/src/api/dispatcher_host.h b/src/api/dispatcher_host.h
@@ -113,6 +113,8 @@ class DispatcherHost : public content::RenderViewHostObserver {
                      const base::DictionaryValue& manifest,
                      int* routing_id);
   void OnAllocateId(int* ret);
+  void OnSetForceClose(bool force, int* ret);
+
   DISALLOW_COPY_AND_ASSIGN(DispatcherHost);
 };
 
diff --git a/src/renderer/shell_content_renderer_client.cc b/src/renderer/shell_content_renderer_client.cc
@@ -346,6 +346,16 @@ void ShellContentRendererClient::InstallNodeSymbols(
         "process.versions['chromium'] = '" CHROME_VERSION "';"
     ));
     script->Run();
+    v8::Local<v8::Script> script2 = v8::Script::New(v8::String::New(
+        "  nwDispatcher.requireNwGui().Window.get();"
+    ));
+    script2->Run();
+  } else {
+    int ret;
+    RenderViewImpl* render_view = RenderViewImpl::FromWebView(frame->view());
+
+    render_view->Send(new ShellViewHostMsg_SetForceClose(
+            render_view->GetRoutingID(), true, &ret));
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,5 @@ IPC_MESSAGE_CONTROL0(ShellViewMsg_ClearCache)`
`100`	`100`
`101`	`101`	`IPC_SYNC_MESSAGE_ROUTED0_1(ShellViewHostMsg_AllocateId, int)`
`102`	`102`
	`103`	`+IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_SetForceClose, bool, int)`
	`104`	`+`