Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

BUG=304341
R=boliu@chromium.org, nasko@chromium.org

Review URL: https://codereview.chromium.org/104833006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241306 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 2 deletions

diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
index e33e34f..9ffc222 100644
--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
@@ -177,7 +177,7 @@ bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
 
 blink::WebWorkerPermissionClientProxy*
 ContentRendererClient::CreateWorkerPermissionClientProxy(
-    RenderView* render_view, blink::WebFrame* frame) {
+    RenderFrame* render_frame, blink::WebFrame* frame) {
   return NULL;
 }
 
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 1e834fe..e409afa 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -258,7 +258,7 @@ class CONTENT_EXPORT ContentRendererClient {
 
   // Creates a permission client proxy for in-renderer worker.
   virtual blink::WebWorkerPermissionClientProxy*
-      CreateWorkerPermissionClientProxy(RenderView* render_view,
+      CreateWorkerPermissionClientProxy(RenderFrame* render_frame,
                                         blink::WebFrame* frame);
 };
 
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
index 6d4aa64..3a4769c 100644
--- a/content/public/renderer/render_frame_observer.h
+++ b/content/public/renderer/render_frame_observer.h
@@ -11,6 +11,10 @@
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
+namespace blink {
+class WebFrame;
+}
+
 namespace content {
 
 class RendererPpapiHost;
@@ -29,6 +33,17 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   // Called when a Pepper plugin is created.
   virtual void DidCreatePepperPlugin(RendererPpapiHost* host) {}
 
+  // Called when the WebFrame associated with the RenderFrame is created.
+  // When switches::kSitePerProcess is the default, there will be one
+  // RenderFrame per blink::WebFrame. If it's not set though, a RenderFrame can
+  // be used for more than one blink::WebFrame. In that case, this can be called
+  // more than once.
+  virtual void WebFrameCreated(blink::WebFrame* frame) {}
+
+  // These match the Blink API notifications
+  virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
+                                        bool is_new_navigation) {}
+
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;