Merge pull request nwjs#2917 from ghostoy/fix-devtools

rogerwang · rogerwang · commit ece633135fc9 · 2015-01-10T18:55:52.000+08:00
Fix devtools
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -438,21 +438,19 @@ void Shell::ShowDevTools(const char* jail_id, bool headless) {
 
   ShellDevToolsDelegate* delegate =
       browser_client->shell_browser_main_parts()->devtools_delegate();
-  GURL url = delegate->devtools_http_handler()->GetFrontendURL(agent.get());
   DevToolsHttpHandlerImpl* http_handler = static_cast<DevToolsHttpHandlerImpl*>(delegate->devtools_http_handler());
   http_handler->EnumerateTargets();
 
+  GURL url;
   if (headless) {
-    DevToolsAgentHost* agent_host = DevToolsAgentHost::GetOrCreateFor(web_contents()).get();
-
-    url = delegate->devtools_http_handler()->GetFrontendURL(agent_host);
-    DevToolsHttpHandlerImpl* http_handler = static_cast<DevToolsHttpHandlerImpl*>(delegate->devtools_http_handler());
-    http_handler->EnumerateTargets();
+    url = delegate->devtools_http_handler()->GetFrontendURL(agent.get());
     SendEvent("devtools-opened", url.spec());
     return;
+  } else {
+    url = delegate->devtools_http_handler()->GetFrontendURL();
+    SendEvent("devtools-opened", url.spec());
   }
 
-  SendEvent("devtools-opened", url.spec());
   // Use our minimum set manifest
   base::DictionaryValue manifest;
   manifest.SetBoolean(switches::kmToolbar, false);
@@ -473,7 +471,7 @@ void Shell::ShowDevTools(const char* jail_id, bool headless) {
 
   new ShellDevToolsFrontend(
       shell,
-      DevToolsAgentHost::GetOrCreateFor(web_contents_.get()).get());
+      agent.get());
 
   int rh_id = shell->web_contents_->GetRenderProcessHost()->GetID();
   ChildProcessSecurityPolicyImpl::GetInstance()->GrantScheme(rh_id, url::kFileScheme);
diff --git a/src/shell_devtools_frontend.cc b/src/shell_devtools_frontend.cc
@@ -69,13 +69,16 @@ ShellDevToolsFrontend::~ShellDevToolsFrontend() {
 
 void ShellDevToolsFrontend::RenderViewCreated(
     RenderViewHost* render_view_host) {
-#if 0
   if (!frontend_host_) {
     frontend_host_.reset(DevToolsFrontendHost::Create(render_view_host, this));
     DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
         agent_host_.get(), this);
   }
-#endif
+}
+
+void ShellDevToolsFrontend::DocumentOnLoadCompletedInMainFrame() {
+  web_contents()->GetMainFrame()->ExecuteJavaScript(
+      base::ASCIIToUTF16("InspectorFrontendAPI.setUseSoftMenu(true);"));
 }
 
 void ShellDevToolsFrontend::WebContentsDestroyed() {
diff --git a/src/shell_devtools_frontend.h b/src/shell_devtools_frontend.h
@@ -37,6 +37,7 @@ class ShellDevToolsFrontend : public WebContentsObserver,
 
   // WebContentsObserver overrides
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+  virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
 
   // content::DevToolsFrontendHost::Delegate implementation.
