DevTools: devtools manager should know nothing about DevToolsWindow

chrome/browser/external_tab_container_win.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 "chrome/browser/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/page_info_bubble_view.h"
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/devtools_toggle_action.h"
+#include "content/browser/debugger/devtools_window.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/common/bindings_policy.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
 #include "content/common/page_transition_types.h"
@@ skipping 908 matching lines @@
     case IDC_ZOOM_PLUS:
       host->Send(new ViewMsg_Zoom(host->routing_id(), PageZoom::ZOOM_IN));
       break;
     case IDC_ZOOM_NORMAL:
       host->Send(new ViewMsg_Zoom(host->routing_id(), PageZoom::RESET));
       break;
     case IDC_ZOOM_MINUS:
       host->Send(new ViewMsg_Zoom(host->routing_id(), PageZoom::ZOOM_OUT));
       break;
     case IDC_DEV_TOOLS:
-      DevToolsManager::GetInstance()->ToggleDevToolsWindow(
+      DevToolsWindow::ToggleDevToolsWindow(
           tab_contents_->render_view_host(), DEVTOOLS_TOGGLE_ACTION_NONE);
       break;
     case IDC_DEV_TOOLS_CONSOLE:
-      DevToolsManager::GetInstance()->ToggleDevToolsWindow(
+      DevToolsWindow::ToggleDevToolsWindow(
           tab_contents_->render_view_host(),
           DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
       break;
     case IDC_DEV_TOOLS_INSPECT:
-      DevToolsManager::GetInstance()->ToggleDevToolsWindow(
+      DevToolsWindow::ToggleDevToolsWindow(
           tab_contents_->render_view_host(),
           DEVTOOLS_TOGGLE_ACTION_INSPECT);
       break;
     default:
       NOTREACHED() << "Unsupported accelerator: " << command_id;
       return false;
   }
   return true;
 }
 
@@ skipping 135 matching lines @@
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }