Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

content/public/renderer/render_frame_observer.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
+namespace blink {
+class WebFrame;
+}
+
 namespace content {
 
 class RendererPpapiHost;
 class RenderFrame;
 class RenderFrameImpl;
 
 // Base class for objects that want to filter incoming IPCs, and also get
 // notified of changes to the frame.
 class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
                                            public IPC::Sender {
  public:
   // By default, observers will be deleted when the RenderFrame goes away.  If
   // they want to outlive it, they can override this function.
   virtual void OnDestruct();
 
   // 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;
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   RenderFrame* render_frame() const;
   int routing_id() const { return routing_id_; }
 
  protected:
@@ skipping 10 matching lines @@
   RenderFrame* render_frame_;
   // The routing ID of the associated RenderFrame.
   int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_