Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1755)

Unified Diff: content/browser/renderer_host/render_view_host.cc

Issue 8676032: Move RenderViewHostObserver to content/public/browser/ and put it into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add render_view_host.h to DEPS file Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host.cc
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 4c2288b505b22138c23e4292e22333036fbfb0ff..4669ff2eae1ee1bf69649415d7d6cdffccf769f8 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -25,7 +25,6 @@
#include "content/browser/power_save_blocker.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_delegate.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/browser/site_instance.h"
@@ -40,6 +39,7 @@
#include "content/public/browser/notification_details.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 "content/public/common/bindings_policy.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/result_codes.h"
@@ -141,7 +141,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
RenderViewHost::~RenderViewHost() {
FOR_EACH_OBSERVER(
- RenderViewHostObserver, observers_, RenderViewHostDestruction());
+ content::RenderViewHostObserver, observers_, RenderViewHostDestruction());
content::NotificationService::current()->Notify(
content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
@@ -191,7 +191,7 @@ bool RenderViewHost::CreateRenderView(const string16& frame_name) {
delegate_->RenderViewCreated(this);
FOR_EACH_OBSERVER(
- RenderViewHostObserver, observers_, RenderViewHostInitialized());
+ content::RenderViewHostObserver, observers_, RenderViewHostInitialized());
return true;
}
@@ -247,7 +247,8 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
if (!params.url.SchemeIs(chrome::kJavaScriptScheme))
delegate_->DidStartLoading();
- FOR_EACH_OBSERVER(RenderViewHostObserver, observers_, Navigate(params.url));
+ FOR_EACH_OBSERVER(content::RenderViewHostObserver,
+ observers_, Navigate(params.url));
}
void RenderViewHost::NavigateToURL(const GURL& url) {
@@ -653,8 +654,8 @@ bool RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
if (!content::SwappedOutMessages::CanHandleWhileSwappedOut(msg))
return true;
- ObserverListBase<RenderViewHostObserver>::Iterator it(observers_);
- RenderViewHostObserver* observer;
+ ObserverListBase<content::RenderViewHostObserver>::Iterator it(observers_);
+ content::RenderViewHostObserver* observer;
while ((observer = it.GetNext()) != NULL) {
if (observer->OnMessageReceived(msg))
return true;
@@ -1137,11 +1138,11 @@ void RenderViewHost::OnAddMessageToConsole(int32 level,
message << "\", source: " << source_id << " (" << line_no << ")";
}
-void RenderViewHost::AddObserver(RenderViewHostObserver* observer) {
+void RenderViewHost::AddObserver(content::RenderViewHostObserver* observer) {
observers_.AddObserver(observer);
}
-void RenderViewHost::RemoveObserver(RenderViewHostObserver* observer) {
+void RenderViewHost::RemoveObserver(content::RenderViewHostObserver* observer) {
observers_.RemoveObserver(observer);
}

Powered by Google App Engine
This is Rietveld 408576698