Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver
BUG=304341
[email protected], [email protected]
Review URL: https://codereview.chromium.org/104833006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241306 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 0db67f21..c60b0f7 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -174,6 +174,9 @@
virtual BrowserContext* GetBrowserContext() const OVERRIDE;
virtual RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
virtual RenderFrameHost* GetMainFrame() OVERRIDE;
+ virtual void ForEachFrame(
+ const base::Callback<void(RenderFrameHost*)>& on_frame) OVERRIDE;
+ virtual void SendToAllFrames(IPC::Message* message) OVERRIDE;
virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;
virtual void GetRenderViewHostAtPosition(
int x,
@@ -284,6 +287,7 @@
const IPC::Message& message) OVERRIDE;
virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE;
virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE;
+ virtual WebContents* GetAsWebContents() OVERRIDE;
// RenderViewHostDelegate ----------------------------------------------------
virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
@@ -294,7 +298,9 @@
virtual const GURL& GetURL() const OVERRIDE;
virtual const GURL& GetVisibleURL() const OVERRIDE;
virtual const GURL& GetLastCommittedURL() const OVERRIDE;
- virtual WebContents* GetAsWebContents() OVERRIDE;
+ // RenderFrameHostDelegate has the same method, so list it there because this
+ // interface is going away.
+ // virtual WebContents* GetAsWebContents() OVERRIDE;
virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE;
@@ -544,9 +550,9 @@
int merge_history_length,
int32 minimum_page_id) OVERRIDE;
- // Called by InterstitialPageImpl when it creates a RenderViewHost.
- virtual void RenderViewForInterstitialPageCreated(
- RenderViewHost* render_view_host) OVERRIDE;
+ // Called by InterstitialPageImpl when it creates a RenderFrameHost.
+ virtual void RenderFrameForInterstitialPageCreated(
+ RenderFrameHost* render_frame_host) OVERRIDE;
// Sets the passed interstitial as the currently showing interstitial.
// No interstitial page should already be attached.
