Index: chrome/browser/debugger/devtools_window.h |
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h |
index 311b2b70069f9b2005ee18bf02de29978dfa1461..828d8dedc893e49ae20cf334ef17b9bc1c02599a 100644 |
--- a/chrome/browser/debugger/devtools_window.h |
+++ b/chrome/browser/debugger/devtools_window.h |
@@ -12,9 +12,9 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/debugger/devtools_toggle_action.h" |
-#include "content/browser/debugger/devtools_client_host.h" |
#include "content/browser/renderer_host/render_view_host_observer.h" |
#include "content/browser/tab_contents/tab_contents_delegate.h" |
+#include "content/public/browser/devtools/devtools_client_host.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -24,7 +24,6 @@ class Message; |
class Browser; |
class BrowserWindow; |
-class DevToolsAgentHost; |
class PrefService; |
class Profile; |
class RenderViewHost; |
@@ -34,8 +33,12 @@ namespace base { |
class Value; |
} |
+namespace content { |
+class DevToolsAgentHost; |
+} |
+ |
class DevToolsWindow |
- : public DevToolsClientHost, |
+ : public content::DevToolsClientHost, |
private content::NotificationObserver, |
private TabContentsDelegate, |
private RenderViewHostObserver { |
@@ -47,7 +50,7 @@ class DevToolsWindow |
static DevToolsWindow* OpenDevToolsWindowForWorker( |
Profile* profile, |
- DevToolsAgentHost* worker_agent); |
+ content::DevToolsAgentHost* worker_agent); |
static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile); |
static DevToolsWindow* OpenDevToolsWindow(RenderViewHost* inspected_rvh); |
static DevToolsWindow* ToggleDevToolsWindow(RenderViewHost* inspected_rvh, |
@@ -122,7 +125,7 @@ class DevToolsWindow |
static DevToolsWindow* ToggleDevToolsWindow(RenderViewHost* inspected_rvh, |
bool force_open, |
DevToolsToggleAction action); |
- static DevToolsWindow* AsDevToolsWindow(DevToolsClientHost*); |
+ static DevToolsWindow* AsDevToolsWindow(content::DevToolsClientHost*); |
// RenderViewHostObserver overrides. |
virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE; |