Currently we have two types of devtools UI: Chrome built in developer tools window and remote debugger connected over TCP(apavlov is working on it). To allow DevToolsManager coordinate both types of devtools uniformly their API is extracted into DevToolsClientHost interface.

Fix purify errors in DevToolsManager unit tests.
BUG=9150
Review URL: http://codereview.chromium.org/50009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12274 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 15 deletions

diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 257c44d..da13ae2 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -6,32 +6,29 @@
 #define CHROME_BROWSER_DEBUGGER_DEV_TOOLS_WINDOW_H_
 
 #include "base/basictypes.h"
+#include "chrome/browser/debugger/devtools_client_host.h"
 
-class DevToolsInstanceDescriptor;
+class RenderViewHost;
 
-class DevToolsWindow {
+class DevToolsWindow : public DevToolsClientHost {
  public:
-  static DevToolsWindow* Create(DevToolsInstanceDescriptor* descriptor);
+  // Factory method for creating platform specific devtools windows.
+  static DevToolsWindow* Create();
+
   virtual ~DevToolsWindow() {}
 
-  // Show developer tools window.
+  // Show this window.
   virtual void Show() = 0;
-  virtual void Close() = 0;
+  virtual bool HasRenderViewHost(const RenderViewHost& rvh) const = 0;
+
+  // DevToolsClientHost override.
+  virtual DevToolsWindow* AsDevToolsWindow() { return this; }
 
  protected:
-  DevToolsWindow() {}
+  DevToolsWindow() : DevToolsClientHost() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
-// Factory for creating DevToolsWindows.  Useful for unit tests.
-class DevToolsWindowFactory {
- public:
-  virtual ~DevToolsWindowFactory() {}
-  virtual DevToolsWindow* CreateDevToolsWindow(
-      DevToolsInstanceDescriptor* descriptor) = 0;
-};
-
-
 #endif  // CHROME_BROWSER_DEBUGGER_DEV_TOOLS_WINDOW_H_