Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 122 matching lines @@
 
   GetContentClient()->renderer()->RenderFrameCreated(this);
 }
 
 RenderFrameImpl::~RenderFrameImpl() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
   RenderThread::Get()->RemoveRoute(routing_id_);
 }
 
+void RenderFrameImpl::MainWebFrameCreated(blink::WebFrame* frame) {
+  FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
+                    WebFrameCreated(frame));
+}
+
 RenderWidget* RenderFrameImpl::GetRenderWidget() {
   return render_view_;
 }
 
 #if defined(ENABLE_PLUGINS)
 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
                     DidCreatePepperPlugin(host));
 }
 
@@ skipping 414 matching lines @@
   return new RendererWebApplicationCacheHostImpl(
       RenderViewImpl::FromWebView(frame->view()), client,
       RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
 }
 
 blink::WebWorkerPermissionClientProxy*
 RenderFrameImpl::createWorkerPermissionClientProxy(WebFrame* frame) {
   if (!frame || !frame->view())
     return NULL;
   return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy(
-      RenderViewImpl::FromWebView(frame->view()), frame);
+      this, frame);
 }
 
 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) {
   return render_view_->cookieJar(frame);
 }
 
 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
     blink::WebFrame* frame,
     blink::WebServiceWorkerProviderClient* client) {
   return new WebServiceWorkerProviderImpl(
@@ skipping 21 matching lines @@
                                            &routing_id));
     child_render_frame = RenderFrameImpl::Create(render_view_, routing_id);
   }
 
   blink::WebFrame* web_frame = WebFrame::create(child_render_frame,
                                                 child_frame_identifier);
 
   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;
 }
 
 void RenderFrameImpl::didDisownOpener(blink::WebFrame* frame) {
   render_view_->didDisownOpener(frame);
 }
 
 void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
@@ skipping 227 matching lines @@
   // * page_id_
   // * next_page_id_
   // * history_list_offset_
   // * history_list_length_
   // * history_page_ids_
   // Needed methods
   // * webview
   // * 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) {
   // TODO(nasko): Move implementation here. Needed state:
   // * enabled_bindings_
   // * dom_automation_controller_
   // * stats_collection_controller_
   render_view_->didClearWindowObject(frame);
 }
 
@@ skipping 486 matching lines @@
 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) {
   observer->RenderFrameGone();
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace content