Remove redundant DevToolsManager methods and clean up its clients.

chrome/browser/devtools/devtools_window.cc

 // Copyright (c) 2012 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/lazy_instance.h"
 #include "base/stringprintf.h"
@@ skipping 122 matching lines @@
 // static
 DevToolsWindow* DevToolsWindow::GetDockedInstanceForInspectedTab(
     WebContents* inspected_web_contents) {
   if (!inspected_web_contents)
     return NULL;
 
   if (!DevToolsAgentHost::HasFor(inspected_web_contents->GetRenderViewHost()))
     return NULL;
   scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetOrCreateFor(
       inspected_web_contents->GetRenderViewHost()));
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
-  DevToolsWindow* window = AsDevToolsWindow(client_host);
+  DevToolsWindow* window = FindDevToolsWindow(agent);
   return window && window->IsDocked() ? window : NULL;
 }
 
 // static
 bool DevToolsWindow::IsDevToolsWindow(RenderViewHost* window_rvh) {
   return AsDevToolsWindow(window_rvh) != NULL;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
-  DevToolsWindow* window;
-  DevToolsClientHost* client = content::DevToolsManager::GetInstance()->
-      GetDevToolsClientHostFor(worker_agent);
-  if (client) {
-    window = AsDevToolsWindow(client);
-    if (!window)
-      return NULL;
-  } else {
+  DevToolsWindow* window = FindDevToolsWindow(worker_agent);
+  if (!window) {
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
+    // Will disconnect the current client host if there is one.
     DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
         worker_agent,
         window->frontend_host_.get());
   }
   window->Show(DEVTOOLS_TOGGLE_ACTION_SHOW);
   return window;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
@@ skipping 109 matching lines @@
   instances.erase(it);
 }
 
 content::WebContents* DevToolsWindow::GetInspectedWebContents() {
   if (!inspected_contents_observer_)
     return NULL;
   return inspected_contents_observer_->Get();
 }
 
 void DevToolsWindow::InspectedContentsClosing() {
+  Hide();
+}
+
+void DevToolsWindow::Hide() {
   if (IsDocked()) {
     // Update dev tools to reflect removed dev tools window.
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->UpdateDevTools();
     // In case of docked web_contents_, we own it so delete here.
     delete web_contents_;
 
     delete this;
   } else {
@@ skipping 401 matching lines @@
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
     RenderViewHost* inspected_rvh,
     bool force_open,
     DevToolsToggleAction action) {
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
   DevToolsManager* manager = DevToolsManager::GetInstance();
-  DevToolsClientHost* host = manager->GetDevToolsClientHostFor(agent);
-  DevToolsWindow* window = AsDevToolsWindow(host);
-  if (host && !window) {
-    // Break remote debugging / extension debugging session.
-    host->ReplacedWithAnotherClient();
-    manager->UnregisterDevToolsClientHostFor(agent);
-  }
-
+  DevToolsWindow* window = FindDevToolsWindow(agent);
   bool do_open = force_open;
   if (!window) {
     Profile* profile = Profile::FromBrowserContext(
         inspected_rvh->GetProcess()->GetBrowserContext());
     DevToolsDockSide dock_side = GetDockSideFromPrefs(profile);
     window = Create(profile, inspected_rvh, dock_side, false);
+    // Will disconnect the current client host if there is one.
     manager->RegisterDevToolsClientHostFor(agent, window->frontend_host_.get());
     do_open = true;
   }
 
   // Update toolbar to reflect DevTools changes.
   window->UpdateBrowserToolbar();
 
   // If window is docked and visible, we hide it on toggle. If window is
   // undocked, we show (activate) it.
   if (!window->IsDocked() || do_open)
     window->Show(action);
   else
-    manager->UnregisterDevToolsClientHostFor(agent);
+    window->CloseWindow();
 
   return window;
 }
 
 // static
-DevToolsWindow* DevToolsWindow::AsDevToolsWindow(
-    DevToolsClientHost* client_host) {
-  if (!client_host || g_instances == NULL)
-    return NULL;
+DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
+    DevToolsAgentHost* agent_host) {
+  DevToolsManager* manager = DevToolsManager::GetInstance();
   DevToolsWindowList& instances = g_instances.Get();
   for (DevToolsWindowList::iterator it = instances.begin();
        it != instances.end(); ++it) {
-    if ((*it)->frontend_host_.get() == client_host)
+    if (manager->GetDevToolsAgentHostFor((*it)->frontend_host_.get()) ==
+        agent_host)
       return *it;
   }
   return NULL;
 }
 
 // static
 DevToolsWindow* DevToolsWindow::AsDevToolsWindow(RenderViewHost* window_rvh) {
   if (g_instances == NULL)
     return NULL;
   DevToolsWindowList& instances = g_instances.Get();
@@ skipping 24 matching lines @@
   SetHeight(height);
   // Update inspected window to adjust heights.
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateDevTools();
 }
 
 void DevToolsWindow::CloseWindow() {
   DCHECK(IsDocked());
   DevToolsManager::GetInstance()->ClientHostClosing(frontend_host_.get());
-  InspectedContentsClosing();
+  Hide();
 }
 
 void DevToolsWindow::MoveWindow(int x, int y) {
   if (!IsDocked()) {
     gfx::Rect bounds = browser_->window()->GetBounds();
     bounds.Offset(x, y);
     browser_->window()->SetBounds(bounds);
   }
 }
 
@@ skipping 229 matching lines @@
 
 // static
 DevToolsDockSide DevToolsWindow::SideFromString(
     const std::string& dock_side) {
   if (dock_side == kDockSideRight)
     return DEVTOOLS_DOCK_SIDE_RIGHT;
   if (dock_side == kDockSideBottom)
     return DEVTOOLS_DOCK_SIDE_BOTTOM;
   return DEVTOOLS_DOCK_SIDE_UNDOCKED;
 }