Allow different types of devtools client

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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/browser.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/debugger/devtools_manager.h"
+#include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ skipping 905 matching lines @@
 #if defined(OS_WIN)
 void Browser::OpenCreateShortcutsDialog() {
   UserMetrics::RecordAction(L"CreateShortcut", profile_);
   GetSelectedTabContents()->AsWebContents()->CreateShortcut();
 }
 
 void Browser::OpenDebuggerWindow() {
 #ifndef CHROME_DEBUGGER_DISABLED
   UserMetrics::RecordAction(L"Debugger", profile_);
   TabContents* current_tab = GetSelectedTabContents();
-  if (current_tab->AsWebContents()) {
+  WebContents* wc = current_tab->AsWebContents();
+  if (wc) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableOutOfProcessDevTools)) {
-      WebContents* wc = current_tab->AsWebContents();
-      g_browser_process->devtools_manager()->ShowDevToolsForWebContents(wc);
+      DevToolsManager* manager = g_browser_process->devtools_manager();
+      DevToolsClientHost* host = manager->GetDevToolsClientHostFor(*wc);
+      if (!host) {
+        host = DevToolsWindow::Create();
+        manager->RegisterDevToolsClientHostFor(*wc, host);
+      }
+      DevToolsWindow* window = host->AsDevToolsWindow();
+      if (window)
+        window->Show();
     } else {
       // Only one debugger instance can exist at a time right now.
       // TODO(erikkay): need an alert, dialog, something
       // or better yet, fix the one instance limitation
       if (!DebuggerWindow::DoesDebuggerExist())
         debugger_window_ = new DebuggerWindow();
       debugger_window_->Show(current_tab);
     }
   }
 #endif
@@ skipping 1530 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }