Define DevTools content API

chrome/browser/debugger/devtools_window.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "grit/generated_resources.h"
 
+using content::DevToolsAgentHostRegistry;
+
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 // static
 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 // static
 TabContentsWrapper* DevToolsWindow::GetDevToolsContents(
     TabContents* inspected_tab) {
   if (!inspected_tab)
     return NULL;
 
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  if (!manager)
-    return NULL;  // Happens only in tests.
-
-  DevToolsClientHost* client_host = manager->
-      GetDevToolsClientHostFor(inspected_tab->render_view_host());
+  content::DevToolsManager* manager =
+      content::DevToolsManager::GetInstance();
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::FindDevToolsAgentHost(
+      inspected_tab->render_view_host());
+  if (!agent)
+    return NULL;
+  DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(client_host);
   if (!window || !window->is_docked())
     return NULL;
   return window->tab_contents();
 }
 
 // static
 DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
     RenderViewHost* window_rvh) {
   DevToolsClientHost* client_host =
       DevToolsClientHost::FindOwnerClientHost(window_rvh);
   return client_host != NULL ? DevToolsWindow::AsDevToolsWindow(client_host)
                              : NULL;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
-  DevToolsClientHost* client =
-      DevToolsManager::GetInstance()->GetDevToolsClientHostFor(worker_agent);
+  DevToolsClientHost* client = content::DevToolsManager::GetInstance()->
+      GetDevToolsClientHostFor(worker_agent);
   if (client) {
     window = AsDevToolsWindow(client);
     if (!window)
       return NULL;
   } else {
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
-    DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(worker_agent,
-                                                                  window);
+    content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+        worker_agent,
+        window);
   }
   window->Show(DEVTOOLS_TOGGLE_ACTION_NONE);
   return window;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
     Profile* profile) {
   return Create(profile, NULL, false, true);
 }
@@ skipping 499 matching lines @@
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
     RenderViewHost* inspected_rvh,
     bool force_open,
     DevToolsToggleAction action) {
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-
-  DevToolsClientHost* host = manager->GetDevToolsClientHostFor(inspected_rvh);
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      inspected_rvh);
+  content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
+  DevToolsClientHost* host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(host);
   if (host != NULL && window == NULL) {
     // Break remote debugging / extension debugging session.
-    manager->UnregisterDevToolsClientHostFor(inspected_rvh);
+    manager->UnregisterDevToolsClientHostFor(agent);
   }
 
   bool do_open = force_open;
   if (!window) {
     Profile* profile = Profile::FromBrowserContext(
         inspected_rvh->process()->GetBrowserContext());
     bool docked = profile->GetPrefs()->GetBoolean(prefs::kDevToolsOpenDocked);
     window = Create(profile, inspected_rvh, docked, false);
-    manager->RegisterDevToolsClientHostFor(inspected_rvh, window);
+    manager->RegisterDevToolsClientHostFor(agent, window);
     do_open = true;
   }
 
   // If window is docked and visible, we hide it on toggle. If window is
   // undocked, we show (activate) it.
   if (!window->is_docked() || do_open)
     window->Show(action);
   else
-    manager->UnregisterDevToolsClientHostFor(inspected_rvh);
+    manager->UnregisterDevToolsClientHostFor(agent);
 
   return window;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::AsDevToolsWindow(
     DevToolsClientHost* client_host) {
   if (!client_host)
     return NULL;
   if (client_host->GetClientRenderViewHost() != NULL)
@@ skipping 30 matching lines @@
   RequestSetDocked(false);
 }
 
 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
   if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) {
     return inspected_tab_->tab_contents()->delegate()->
         GetJavaScriptDialogCreator();
   }
   return TabContentsDelegate::GetJavaScriptDialogCreator();
 }