Fixed behavior in case of disabled devtools

chrome/browser/ui/apps/chrome_app_window_client.cc

Index: chrome/browser/ui/apps/chrome_app_window_client.cc
diff --git a/chrome/browser/ui/apps/chrome_app_window_client.cc b/chrome/browser/ui/apps/chrome_app_window_client.cc
index fc9eb507add7461f04b238e2c1edbb77b3c87c53..107803ef8fea7466ee511138496cbb67d03c0270 100644
--- a/chrome/browser/ui/apps/chrome_app_window_client.cc
+++ b/chrome/browser/ui/apps/chrome_app_window_client.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/common/extensions/features/feature_channel.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/common/extension.h"
 
@@ -55,9 +56,14 @@ extensions::NativeAppWindow* ChromeAppWindowClient::CreateNativeAppWindow(
 void ChromeAppWindowClient::OpenDevToolsWindow(
     content::WebContents* web_contents,
     const base::Closure& callback) {
-  DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow(
-      web_contents, DevToolsToggleAction::ShowConsole());
-  devtools_window->SetLoadCompletedCallback(callback);
+  scoped_refptr<content::DevToolsAgentHost> agent(
+      content::DevToolsAgentHost::GetOrCreateFor(web_contents));
+  DevToolsWindow::OpenDevToolsWindow(web_contents);
+
+  DevToolsWindow* devtools_window =
+      DevToolsWindow::FindDevToolsWindow(agent.get());
+  if (devtools_window)
+    devtools_window->SetLoadCompletedCallback(callback);

[dgozman, 2015/03/03 19:31:24]

What if there is no window? Perhaps something is waiting for the |callback| to
be called?

 }
 
 bool ChromeAppWindowClient::IsCurrentChannelOlderThanDev() {