DevTools: devtools manager should know nothing about DevToolsWindow

content/browser/debugger/devtools_handler.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_handler.h"
 
 #include "content/browser/debugger/devtools_file_util.h"
 #include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 
 DevToolsHandler::DevToolsHandler(RenderViewHost* render_view_host)
     : RenderViewHostObserver(render_view_host) {
 }
 
 DevToolsHandler::~DevToolsHandler() {
 }
@@ skipping 11 matching lines @@
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_SaveAs,
                         OnSaveAs)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_RuntimePropertyChanged,
                         OnRuntimePropertyChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void DevToolsHandler::OnForwardToAgent(const IPC::Message& message) {
-  DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
-      render_view_host(), message);
+  DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(
+      render_view_host());
+  if (!window)
+    return;
+  DevToolsManager::GetInstance()->ForwardToDevToolsAgent(window, message);
 }
 
 void DevToolsHandler::OnForwardToClient(const IPC::Message& message) {
   DevToolsManager::GetInstance()->ForwardToDevToolsClient(
       render_view_host(), message);
 }
 
 void DevToolsHandler::OnActivateWindow() {
-  DevToolsManager::GetInstance()->ActivateWindow(render_view_host());
+  DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(
+      render_view_host());
+  if (window)
+    window->Activate();
 }
 
 void DevToolsHandler::OnCloseWindow() {
-  DevToolsManager::GetInstance()->CloseWindow(render_view_host());
+  DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(
+      render_view_host());
+  if (window)
+    window->Close();
 }
 
 void DevToolsHandler::OnRequestDockWindow() {
-  DevToolsManager::GetInstance()->RequestDockWindow(render_view_host());
+  DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(
+      render_view_host());
+  if (window)
+    window->SetDocked(true);
 }
 
 void DevToolsHandler::OnRequestUndockWindow() {
-  DevToolsManager::GetInstance()->RequestUndockWindow(render_view_host());
+  DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(
+      render_view_host());
+  if (window)
+    window->SetDocked(false);
 }
 
 void DevToolsHandler::OnSaveAs(const std::string& file_name,
                                const std::string& content) {
   TabContents* tab_contents = render_view_host()->delegate() ?
       render_view_host()->delegate()->GetAsTabContents() : NULL;
   DCHECK(tab_contents);
   if (!tab_contents)
     return;
 
   DevToolsFileUtil::SaveAs(tab_contents->profile(), file_name, content);
 }
 
 void DevToolsHandler::OnRuntimePropertyChanged(const std::string& name,
                                                const std::string& value) {
   DevToolsManager::GetInstance()->RuntimePropertyChanged(
       render_view_host(), name, value);
 }