diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-28 01:33:10 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-28 01:33:10 +0000 |
| commit | 6952f00643ee2d1a58177dd90f35e3542690cc87 (patch) | |
| tree | e7fd1854ca634fbcce3198ee499688f545c6bbc0 /content/public | |
| parent | 5dcaf8ec918ad9caa97218b7921eb7946911248e (diff) | |
| download | chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.zip chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.gz chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.bz2 | |
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/120413003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/content_browser_client.h | 2 | ||||
| -rw-r--r-- | content/public/browser/render_frame_host.h | 4 | ||||
| -rw-r--r-- | content/public/renderer/content_renderer_client.cc | 2 | ||||
| -rw-r--r-- | content/public/renderer/content_renderer_client.h | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index 8878a9a..0e2e2a3 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -387,7 +387,7 @@ class CONTENT_EXPORT ContentBrowserClient { // or denied immediately, and the callback won't be run. virtual void AllowCertificateError( int render_process_id, - int render_view_id, + int render_frame_id, int cert_error, const net::SSLInfo& ssl_info, const GURL& request_url, diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h index 3aaec7c..e33b12d 100644 --- a/content/public/browser/render_frame_host.h +++ b/content/public/browser/render_frame_host.h @@ -12,6 +12,7 @@ namespace content { class RenderProcessHost; +class RenderViewHost; class SiteInstance; // The interface provides a communication conduit with a frame in the renderer. @@ -35,6 +36,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener, // Returns the associated widget's native view. virtual gfx::NativeView GetNativeView() = 0; + // Temporary until we get rid of RenderViewHost. + virtual RenderViewHost* GetRenderViewHost() = 0; + private: // This interface should only be implemented inside content. friend class RenderFrameHostImpl; diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index 9ffc222..344cbe3 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -93,7 +93,7 @@ bool ContentRendererClient::AllowPopup() { #ifdef OS_ANDROID bool ContentRendererClient::HandleNavigation( - RenderView* view, + RenderFrame* render_frame, DocumentState* document_state, int opener_id, blink::WebFrame* frame, diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index e409afa..958d1fa 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -179,7 +179,7 @@ class CONTENT_EXPORT ContentRendererClient { // // Returns true if the navigation was handled by the embedder and should be // ignored by WebKit. This method is used by CEF and android_webview. - virtual bool HandleNavigation(RenderView* view, + virtual bool HandleNavigation(RenderFrame* render_frame, DocumentState* document_state, int opener_id, blink::WebFrame* frame, |