DevTools: devtools manager should know nothing about DevToolsWindow

content/browser/debugger/devtools_window.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
 #define CONTENT_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_toggle_action.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 namespace IPC {
 class Message;
 }
 
 class Browser;
 class BrowserWindow;
 class Profile;
 class RenderViewHost;
 class Value;
 
 class DevToolsWindow
     : public DevToolsClientHost,
       public NotificationObserver,
       public TabContentsDelegate {
  public:
   static const char kDevToolsApp[];
   static TabContentsWrapper* GetDevToolsContents(TabContents* inspected_tab);
+  static DevToolsWindow* FindDevToolsWindow(RenderViewHost* window_rvh);
 
-  DevToolsWindow(Profile* profile, RenderViewHost* inspected_rvh, bool docked);
+  static void OpenDevToolsWindow(RenderViewHost* inspected_rvh);
+  static void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
+                                   DevToolsToggleAction action);
+  static void InspectElement(RenderViewHost* inspected_rvh, int x, int y);
+
   virtual ~DevToolsWindow();
 
   // Overridden from DevToolsClientHost.
-  virtual DevToolsWindow* AsDevToolsWindow();
   virtual void SendMessageToClient(const IPC::Message& message);
   virtual void InspectedTabClosing();
   virtual void TabReplaced(TabContentsWrapper* new_tab);
 
   void Show(DevToolsToggleAction action);
   void Activate();
   void SetDocked(bool docked);
   RenderViewHost* GetRenderViewHost();
 
   TabContentsWrapper* tab_contents() { return tab_contents_; }
   Browser* browser() { return browser_; }  // For tests.
   bool is_docked() { return docked_; }
 
  private:
+  DevToolsWindow(Profile* profile, RenderViewHost* inspected_rvh, bool docked);
+
   void CreateDevToolsBrowser();
   bool FindInspectedBrowserAndTabIndex(Browser**, int* tab);
   BrowserWindow* GetInspectedBrowserWindow();
   bool IsInspectedBrowserPopupOrPanel();
   void UpdateFrontendAttachedState();
 
   // Overridden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 17 matching lines @@
                               const gfx::Rect& initial_pos,
                               bool user_gesture);
   virtual void CloseContents(TabContents* source) {}
   virtual bool CanReloadContents(TabContents* source) const;
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
 
   virtual void FrameNavigating(const std::string& url) {}
 
+  static void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
+                                   bool force_open,
+                                   DevToolsToggleAction action);
+  static DevToolsWindow* AsDevToolsWindow(DevToolsClientHost*);
+
   Profile* profile_;
   TabContentsWrapper* inspected_tab_;
   TabContentsWrapper* tab_contents_;
   Browser* browser_;
   bool docked_;
   bool is_loaded_;
   DevToolsToggleAction action_on_load_;
   NotificationRegistrar registrar_;
+  typedef std::vector<DevToolsWindow*> DevToolsWindowList;
+  static DevToolsWindowList instances_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
 #endif  // CONTENT_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_