DevTools: devtools manager should know nothing about DevToolsWindow

content/browser/debugger/devtools_window.h

Index: content/browser/debugger/devtools_window.h
diff --git a/content/browser/debugger/devtools_window.h b/content/browser/debugger/devtools_window.h
index 744d1d334eaf8508c7aa7a8ad8b1a24b5b23a41f..56a470ff159a6780ce66c48fdaec6bf14707c43e 100644
--- a/content/browser/debugger/devtools_window.h
+++ b/content/browser/debugger/devtools_window.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "content/browser/debugger/devtools_client_host.h"
@@ -32,12 +33,16 @@ class DevToolsWindow
  public:
   static const char kDevToolsApp[];
   static TabContentsWrapper* GetDevToolsContents(TabContents* inspected_tab);
+  static DevToolsWindow* FindDevToolsWindow(RenderViewHost* window_rvh);
+
+  static void OpenDevToolsWindow(RenderViewHost* inspected_rvh);

[pfeldman, 2011/07/07 12:17:52]

Nit: This should return DevToolsWindow (it should not be expensive)

[yurys, 2011/07/07 12:30:40]

Done.

+  static void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
+                                   DevToolsToggleAction action);
+  static void InspectElement(RenderViewHost* inspected_rvh, int x, int y);
 
-  DevToolsWindow(Profile* profile, RenderViewHost* inspected_rvh, bool docked);
   virtual ~DevToolsWindow();
 
   // Overridden from DevToolsClientHost.
-  virtual DevToolsWindow* AsDevToolsWindow();
   virtual void SendMessageToClient(const IPC::Message& message);
   virtual void InspectedTabClosing();
   virtual void TabReplaced(TabContentsWrapper* new_tab);
@@ -53,6 +58,8 @@ class DevToolsWindow
   bool is_docked() { return docked_; }
 
  private:
+  DevToolsWindow(Profile* profile, RenderViewHost* inspected_rvh, bool docked);
+
   void CreateDevToolsBrowser();
   bool FindInspectedBrowserAndTabIndex(Browser**, int* tab);
   BrowserWindow* GetInspectedBrowserWindow();
@@ -90,6 +97,11 @@ class DevToolsWindow
 
   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_;
@@ -98,6 +110,8 @@ class DevToolsWindow
   bool is_loaded_;
   DevToolsToggleAction action_on_load_;
   NotificationRegistrar registrar_;
+  typedef std::vector<DevToolsWindow*> DevToolsWindowList;
+  static DevToolsWindowList instances_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };