diff options
Diffstat (limited to 'chrome/browser/renderer_host')
6 files changed, 29 insertions, 25 deletions
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 8945f04..9737c58 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc @@ -148,13 +148,13 @@ void ChromeRenderViewHostObserver::OnDomOperationResponse( DomOperationNotificationDetails details(json_string, automation_id); NotificationService::current()->Notify( chrome::NOTIFICATION_DOM_OPERATION_RESPONSE, - Source<RenderViewHost>(render_view_host()), - Details<DomOperationNotificationDetails>(&details)); + content::Source<RenderViewHost>(render_view_host()), + content::Details<DomOperationNotificationDetails>(&details)); } void ChromeRenderViewHostObserver::OnFocusedEditableNodeTouched() { NotificationService::current()->Notify( chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED, - Source<RenderViewHost>(render_view_host()), + content::Source<RenderViewHost>(render_view_host()), NotificationService::NoDetails()); } diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index ea94aaf..494e975 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -80,7 +80,8 @@ void NotifyDownloadInitiatedOnUI(int render_process_id, int render_view_id) { return; NotificationService::current()->Notify( - chrome::NOTIFICATION_DOWNLOAD_INITIATED, Source<RenderViewHost>(rvh), + chrome::NOTIFICATION_DOWNLOAD_INITIATED, + content::Source<RenderViewHost>(rvh), NotificationService::NoDetails()); } diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index bb48956..98421a5 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -422,9 +422,10 @@ void RenderWidgetHostViewViews::SelectionBoundsChanged( } } -void RenderWidgetHostViewViews::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { +void RenderWidgetHostViewViews::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { #if defined(TOUCH_UI) if (type != chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED) { NOTREACHED(); diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h index 91bdf46..c476765 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.h +++ b/chrome/browser/renderer_host/render_widget_host_view_views.h @@ -14,8 +14,8 @@ #include "base/task.h" #include "base/time.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/gfx/compositor/compositor_observer.h" #include "ui/gfx/native_widget_types.h" @@ -48,7 +48,7 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView, #endif public views::TouchSelectionClientView, public views::TextInputClient, - public NotificationObserver { + public content::NotificationObserver { public: // Internal class name. static const char kViewClassName[]; @@ -130,10 +130,10 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView, virtual void SelectRect(const gfx::Point& start, const gfx::Point& end) OVERRIDE; - // Overriden from NotificationObserver + // Overriden from content::NotificationObserver virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; // Overridden from ui::SimpleMenuModel::Delegate. virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; @@ -310,7 +310,7 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView, #if defined(TOUCH_UI) // used to register for keyboard visiblity notificatons. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; gfx::Rect keyboard_rect_; #endif diff --git a/chrome/browser/renderer_host/web_cache_manager.cc b/chrome/browser/renderer_host/web_cache_manager.cc index d6cac02..07ae824 100644 --- a/chrome/browser/renderer_host/web_cache_manager.cc +++ b/chrome/browser/renderer_host/web_cache_manager.cc @@ -158,16 +158,18 @@ void WebCacheManager::ClearCacheOnNavigation() { } void WebCacheManager::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case content::NOTIFICATION_RENDERER_PROCESS_CREATED: { - RenderProcessHost* process = Source<RenderProcessHost>(source).ptr(); + RenderProcessHost* process = + content::Source<RenderProcessHost>(source).ptr(); Add(process->id()); break; } case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: { - RenderProcessHost* process = Source<RenderProcessHost>(source).ptr(); + RenderProcessHost* process = + content::Source<RenderProcessHost>(source).ptr(); Remove(process->id()); break; } diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index 0006572..e93a26c 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -18,15 +18,15 @@ #include "base/gtest_prod_util.h" #include "base/task.h" #include "base/time.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" template<typename Type> struct DefaultSingletonTraits; class PrefService; -class WebCacheManager : public NotificationObserver { +class WebCacheManager : public content::NotificationObserver { friend class WebCacheManagerTest; FRIEND_TEST_ALL_PREFIXES(WebCacheManagerBrowserTest, CrashOnceOnly); @@ -74,10 +74,10 @@ class WebCacheManager : public NotificationObserver { // to a different website. void ClearCacheOnNavigation(); - // NotificationObserver implementation: + // content::NotificationObserver implementation: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; // Gets the default global size limit. This interrogates system metrics to // tune the default size to the current system. @@ -215,7 +215,7 @@ class WebCacheManager : public NotificationObserver { ScopedRunnableMethodFactory<WebCacheManager> revise_allocation_factory_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(WebCacheManager); }; |