DevTools: handle docked window close in DevToolsWindow, not DevToolsManager.

content/browser/debugger/devtools_manager.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 "content/browser/debugger/devtools_manager.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/message_loop.h"
@@ skipping 105 matching lines @@
     return;
 
   DevToolsWindow* window = client_host->AsDevToolsWindow();
   DCHECK(window);
   window->Activate();
 }
 
 void DevToolsManager::CloseWindow(RenderViewHost* client_rvh) {
   DevToolsClientHost* client_host = FindOwnerDevToolsClientHost(client_rvh);
   if (client_host) {
-    RenderViewHost* inspected_rvh = GetInspectedRenderViewHost(client_host);
-    DCHECK(inspected_rvh);
-    UnregisterDevToolsClientHostFor(inspected_rvh);
+    DevToolsWindow* window = client_host->AsDevToolsWindow();
+    DCHECK(window);
+    window->Close();
   }
 }
 
 void DevToolsManager::RequestDockWindow(RenderViewHost* client_rvh) {
   ReopenWindow(client_rvh, true);
 }
 
 void DevToolsManager::RequestUndockWindow(RenderViewHost* client_rvh) {
   ReopenWindow(client_rvh, false);
 }
@@ skipping 318 matching lines @@
   for (InspectedRvhToClientHostMap::iterator it =
            inspected_rvh_to_client_host_.begin();
        it != inspected_rvh_to_client_host_.end(); ++it) {
     rhvs.push_back(it->first);
   }
   for (std::vector<RenderViewHost*>::iterator it = rhvs.begin();
        it != rhvs.end(); ++it) {
     UnregisterDevToolsClientHostFor(*it);
   }
 }