diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 18:28:19 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 18:28:19 +0000 |
| commit | 29571ef0525df6c9a28ebbc4a4fb3a7bfd142667 (patch) | |
| tree | 3ddead0f9a4db01f21708112118d11ab494b5cb4 /chrome/browser/debugger | |
| parent | 406af397186e183a7fdfed6472486db2cfd7a91b (diff) | |
| download | chromium_src-29571ef0525df6c9a28ebbc4a4fb3a7bfd142667.zip chromium_src-29571ef0525df6c9a28ebbc4a4fb3a7bfd142667.tar.gz chromium_src-29571ef0525df6c9a28ebbc4a4fb3a7bfd142667.tar.bz2 | |
Move RenderViewHostObserver to content/public/browser/ and put it into the content namespace.
BUG=98716
R=jam@chromium.org
Review URL: http://codereview.chromium.org/8676032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_window.h | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 8accd2b..9a54f45 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -164,7 +164,7 @@ DevToolsWindow::DevToolsWindow(TabContentsWrapper* tab_contents, Profile* profile, RenderViewHost* inspected_rvh, bool docked) - : RenderViewHostObserver(tab_contents->render_view_host()), + : content::RenderViewHostObserver(tab_contents->render_view_host()), profile_(profile), inspected_tab_(NULL), tab_contents_(tab_contents), diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index b78ea14..87d81cd 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -13,10 +13,10 @@ #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/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/render_view_host_observer.h" namespace IPC { class Message; @@ -34,11 +34,10 @@ namespace base { class Value; } -class DevToolsWindow - : public DevToolsClientHost, - private content::NotificationObserver, - private TabContentsDelegate, - private RenderViewHostObserver { +class DevToolsWindow : public DevToolsClientHost, + private content::NotificationObserver, + private TabContentsDelegate, + private content::RenderViewHostObserver { public: static const char kDevToolsApp[]; static void RegisterUserPrefs(PrefService* prefs); @@ -125,7 +124,7 @@ class DevToolsWindow DevToolsToggleAction action); static DevToolsWindow* AsDevToolsWindow(DevToolsClientHost*); - // RenderViewHostObserver overrides. + // content::RenderViewHostObserver overrides. virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |