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 /android_webview/renderer | |
| 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 'android_webview/renderer')
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.cc | 8 | ||||
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 74f6db1..09f5a5c 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -19,8 +19,8 @@ #include "content/public/common/url_constants.h" #include "content/public/renderer/document_state.h" #include "content/public/renderer/navigation_state.h" +#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" -#include "content/public/renderer/render_view.h" #include "net/base/net_errors.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" @@ -60,7 +60,7 @@ void AwContentRendererClient::RenderThreadStarted() { } bool AwContentRendererClient::HandleNavigation( - content::RenderView* view, + content::RenderFrame* render_frame, content::DocumentState* document_state, int opener_id, blink::WebFrame* frame, @@ -107,9 +107,9 @@ bool AwContentRendererClient::HandleNavigation( bool ignore_navigation = false; base::string16 url = request.url().string(); - int routing_id = view->GetRoutingID(); + int render_frame_id = render_frame->GetRoutingID(); RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading( - routing_id, url, &ignore_navigation)); + render_frame_id, url, &ignore_navigation)); return ignore_navigation; } diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h index 3a55350..cbabaf1 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h @@ -41,7 +41,7 @@ class AwContentRendererClient : public content::ContentRendererClient { virtual void AddKeySystems( std::vector<content::KeySystemInfo>* key_systems) OVERRIDE; - virtual bool HandleNavigation(content::RenderView* view, + virtual bool HandleNavigation(content::RenderFrame* render_frame, content::DocumentState* document_state, int opener_id, blink::WebFrame* frame, |