Fixed behavior in case of disabled devtools

chrome/browser/ui/apps/chrome_app_window_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/apps/chrome_app_window_client.h"
 
 #include "base/memory/singleton.h"
 #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"
 
 // TODO(jamescook): We probably shouldn't compile this class at all on Android.
 // See http://crbug.com/343612
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #endif
 
 ChromeAppWindowClient::ChromeAppWindowClient() {
@@ skipping 27 matching lines @@
 #if defined(OS_ANDROID)
   return NULL;
 #else
   return CreateNativeAppWindowImpl(window, *params);
 #endif
 }
 
 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() {
   return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
 }