diff options
Diffstat (limited to 'chrome')
14 files changed, 38 insertions, 38 deletions
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index d1d592f..4e03888 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -20,8 +20,8 @@ #include "chrome/browser/ui/views/dom_view.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/render_messages.h" -#include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/render_view_host_observer.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/views/widget/widget.h" @@ -46,10 +46,10 @@ const char kAccelNameEnrollment[] = "enrollment"; // Observes IPC messages from the FrameSniffer and notifies JS if error // appears. -class SnifferObserver : public RenderViewHostObserver { +class SnifferObserver : public content::RenderViewHostObserver { public: SnifferObserver(RenderViewHost* host, WebUI* webui) - : RenderViewHostObserver(host), webui_(webui) { + : content::RenderViewHostObserver(host), webui_(webui) { DCHECK(webui_); Send(new ChromeViewMsg_StartFrameSniffer(routing_id(), UTF8ToUTF16("gaia-frame"))); 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; diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index 256862f..2e2d702 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -28,7 +28,7 @@ void ExtensionFunctionDeleteTraits::Destruct(const ExtensionFunction* x) { UIThreadExtensionFunction::RenderViewHostTracker::RenderViewHostTracker( UIThreadExtensionFunction* function, RenderViewHost* render_view_host) - : RenderViewHostObserver(render_view_host), + : content::RenderViewHostObserver(render_view_host), function_(function) { registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED, diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index 4e35579..d99c487 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -16,10 +16,10 @@ #include "base/process.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension.h" -#include "content/browser/renderer_host/render_view_host_observer.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "content/public/browser/render_view_host_observer.h" #include "ipc/ipc_message.h" class Browser; @@ -289,7 +289,7 @@ class UIThreadExtensionFunction : public ExtensionFunction { // NotificationObservers, and it would be an easy error to forget to call the // base class's Observe() method. class RenderViewHostTracker : public content::NotificationObserver, - public RenderViewHostObserver { + public content::RenderViewHostObserver { public: RenderViewHostTracker(UIThreadExtensionFunction* function, RenderViewHost* render_view_host); diff --git a/chrome/browser/extensions/extension_message_handler.cc b/chrome/browser/extensions/extension_message_handler.cc index 6ba6e46..050139a 100644 --- a/chrome/browser/extensions/extension_message_handler.cc +++ b/chrome/browser/extensions/extension_message_handler.cc @@ -14,7 +14,7 @@ ExtensionMessageHandler::ExtensionMessageHandler( RenderViewHost* render_view_host) - : RenderViewHostObserver(render_view_host) { + : content::RenderViewHostObserver(render_view_host) { } ExtensionMessageHandler::~ExtensionMessageHandler() { diff --git a/chrome/browser/extensions/extension_message_handler.h b/chrome/browser/extensions/extension_message_handler.h index 5fa9a18a..9ace4ae 100644 --- a/chrome/browser/extensions/extension_message_handler.h +++ b/chrome/browser/extensions/extension_message_handler.h @@ -8,7 +8,7 @@ #include <string> -#include "content/browser/renderer_host/render_view_host_observer.h" +#include "content/public/browser/render_view_host_observer.h" // Filters and dispatches extension-related IPC messages that arrive from // renderers. There is one of these objects for each RenderViewHost in Chrome. @@ -19,7 +19,7 @@ // could eliminate this class. Right now, we don't end up with an EFD for tab // contents unless that tab contents is hosting chrome-extension:// URLs. That // still leaves content scripts. See also: crbug.com/80307. -class ExtensionMessageHandler : public RenderViewHostObserver { +class ExtensionMessageHandler : public content::RenderViewHostObserver { public: // |sender| is guaranteed to outlive this object. explicit ExtensionMessageHandler(RenderViewHost* render_view_host); diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.cc b/chrome/browser/prerender/prerender_render_view_host_observer.cc index 5be7b3a..7a5d168 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.cc +++ b/chrome/browser/prerender/prerender_render_view_host_observer.cc @@ -13,7 +13,7 @@ namespace prerender { PrerenderRenderViewHostObserver::PrerenderRenderViewHostObserver( PrerenderContents* prerender_contents, RenderViewHost* render_view_host) - : RenderViewHostObserver(render_view_host), + : content::RenderViewHostObserver(render_view_host), prerender_contents_(prerender_contents) { } @@ -27,7 +27,7 @@ void PrerenderRenderViewHostObserver::RenderViewHostDestroyed( bool PrerenderRenderViewHostObserver::OnMessageReceived( const IPC::Message& message) { if (!prerender_contents_) - return RenderViewHostObserver::OnMessageReceived(message); + return content::RenderViewHostObserver::OnMessageReceived(message); bool handled = true; // The following messages we do want to consume. @@ -42,7 +42,7 @@ bool PrerenderRenderViewHostObserver::OnMessageReceived( // Pass the message through. if (!handled) - handled = RenderViewHostObserver::OnMessageReceived(message); + handled = content::RenderViewHostObserver::OnMessageReceived(message); return handled; } @@ -50,7 +50,7 @@ bool PrerenderRenderViewHostObserver::OnMessageReceived( // The base class declares this as protected so this is just here to make it // public so it is visible to the caller. bool PrerenderRenderViewHostObserver::Send(IPC::Message* message) { - return RenderViewHostObserver::Send(message); + return content::RenderViewHostObserver::Send(message); } void PrerenderRenderViewHostObserver::OnUpdateFaviconURL( diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.h b/chrome/browser/prerender/prerender_render_view_host_observer.h index 0485ca0..86f3620 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.h +++ b/chrome/browser/prerender/prerender_render_view_host_observer.h @@ -7,7 +7,7 @@ #include <vector> -#include "content/browser/renderer_host/render_view_host_observer.h" +#include "content/public/browser/render_view_host_observer.h" struct FaviconURL; class RenderViewHost; @@ -21,7 +21,7 @@ namespace prerender { class PrerenderContents; // Observer for RenderViewHost messages. -class PrerenderRenderViewHostObserver : public RenderViewHostObserver { +class PrerenderRenderViewHostObserver : public content::RenderViewHostObserver { public: PrerenderRenderViewHostObserver(PrerenderContents* prerender_contents, RenderViewHost* render_view_host); diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc index ce09654..81d4f8c 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc @@ -23,7 +23,7 @@ ChromeRenderViewHostObserver::ChromeRenderViewHostObserver( RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor) - : RenderViewHostObserver(render_view_host), + : content::RenderViewHostObserver(render_view_host), predictor_(predictor) { SiteInstance* site_instance = render_view_host->site_instance(); profile_ = Profile::FromBrowserContext( diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.h b/chrome/browser/renderer_host/chrome_render_view_host_observer.h index 7fac8fe..5a933e0 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.h +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_RENDERER_HOST_CHROME_RENDER_VIEW_HOST_OBSERVER_H_ #pragma once -#include "content/browser/renderer_host/render_view_host_observer.h" +#include "content/public/browser/render_view_host_observer.h" namespace chrome_browser_net { class Predictor; @@ -17,13 +17,13 @@ class Profile; // This class holds the Chrome specific parts of RenderViewHost, and has the // same lifetime. -class ChromeRenderViewHostObserver : public RenderViewHostObserver { +class ChromeRenderViewHostObserver : public content::RenderViewHostObserver { public: ChromeRenderViewHostObserver(RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor); virtual ~ChromeRenderViewHostObserver(); - // RenderViewHostObserver overrides. + // content::RenderViewHostObserver overrides. virtual void RenderViewHostInitialized() OVERRIDE; virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE; virtual void Navigate(const GURL& url) OVERRIDE; diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm index 05aa32c..5a3caa1 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm @@ -16,9 +16,9 @@ #include "chrome/common/spellcheck_messages.h" #include "content/browser/mac/closure_blocks_leopard_compat.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/public/browser/render_view_host_observer.h" // Declare things that are part of the 10.7 SDK. #if !defined(MAC_OS_X_VERSION_10_7) || \ @@ -64,12 +64,12 @@ namespace ChromeRenderWidgetHostViewMacDelegateInternal { // Filters the message sent to RenderViewHost to know if spellchecking is // enabled or not for the currently focused element. -class SpellCheckRenderViewObserver : public RenderViewHostObserver { +class SpellCheckRenderViewObserver : public content::RenderViewHostObserver { public: SpellCheckRenderViewObserver( RenderViewHost* host, ChromeRenderWidgetHostViewMacDelegate* view_delegate) - : RenderViewHostObserver(host), + : content::RenderViewHostObserver(host), view_delegate_(view_delegate) { } @@ -77,7 +77,7 @@ class SpellCheckRenderViewObserver : public RenderViewHostObserver { } private: - // RenderViewHostObserver implementation. + // content::RenderViewHostObserver implementation. virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE { // The parent implementation destroys the observer, scoping the lifetime of // the observer to the RenderViewHost. Since this class is acting as a diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index dfdbe31..010cc35 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -32,9 +32,9 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "content/browser/renderer_host/render_view_host_observer.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_view_host_observer.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -126,10 +126,10 @@ chromeos::CellularNetwork* GetCellularNetwork( // Observes IPC messages from the rederer and notifies JS if frame loading error // appears. -class PortalFrameLoadObserver : public RenderViewHostObserver { +class PortalFrameLoadObserver : public content::RenderViewHostObserver { public: PortalFrameLoadObserver(RenderViewHost* host, WebUI* webui) - : RenderViewHostObserver(host), webui_(webui) { + : content::RenderViewHostObserver(host), webui_(webui) { DCHECK(webui_); Send(new ChromeViewMsg_StartFrameSniffer(routing_id(), UTF8ToUTF16("paymentForm"))); diff --git a/chrome/test/test_navigation_observer.cc b/chrome/test/test_navigation_observer.cc index 7e0c2f0..0e9f6bb 100644 --- a/chrome/test/test_navigation_observer.cc +++ b/chrome/test/test_navigation_observer.cc @@ -5,24 +5,25 @@ #include "chrome/test/test_navigation_observer.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/render_view_host_observer.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/public/browser/render_view_host_observer.h" #include "testing/gtest/include/gtest/gtest.h" // This class observes |rvh| and calls OnJsInjectionReady() of // |js_injection_ready_observer| when the time is right to inject // JavaScript into the page. -class TestNavigationObserver::RVHOSendJS : public RenderViewHostObserver { +class TestNavigationObserver::RVHOSendJS + : public content::RenderViewHostObserver { public: RVHOSendJS(RenderViewHost* rvh, JsInjectionReadyObserver* js_injection_ready_observer) - : RenderViewHostObserver(rvh), + : content::RenderViewHostObserver(rvh), js_injection_ready_observer_(js_injection_ready_observer) { } private: - // RenderViewHostObserver implementation. + // content::RenderViewHostObserver implementation. virtual void RenderViewHostInitialized() OVERRIDE { if (js_injection_ready_observer_) js_injection_ready_observer_->OnJsInjectionReady(render_view_host()); |