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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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/renderer/render_frame_impl.cc
===================================================================
--- content/renderer/render_frame_impl.cc (revision 240912)
+++ content/renderer/render_frame_impl.cc (working copy)
@@ -140,6 +140,11 @@
RenderThread::Get()->RemoveRoute(routing_id_);
}
+void RenderFrameImpl::MainWebFrameCreated(blink::WebFrame* frame) {
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+ WebFrameCreated(frame));
+}
+
RenderWidget* RenderFrameImpl::GetRenderWidget() {
return render_view_;
}
@@ -574,7 +579,7 @@
if (!frame || !frame->view())
return NULL;
return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy(
- RenderViewImpl::FromWebView(frame->view()), frame);
+ this, frame);
}
blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) {
@@ -616,6 +621,9 @@
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
g_child_frame_map.Get().insert(
std::make_pair(web_frame, child_render_frame));
+ } else {
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+ WebFrameCreated(web_frame));
}
return web_frame;
@@ -863,6 +871,9 @@
// * UpdateSessionHistory
// * GetLoadingUrl
render_view_->didCommitProvisionalLoad(frame, is_new_navigation);
+
+ FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+ DidCommitProvisionalLoad(frame, is_new_navigation));
}
void RenderFrameImpl::didClearWindowObject(blink::WebFrame* frame) {

Powered by Google App Engine
This is Rietveld 408576698