diff options
| author | mmenke <mmenke@chromium.org> | 2015-10-27 14:06:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 21:07:26 +0000 |
| commit | f1c777e3f97a16cc6a3aa922a23602fa59412989 (patch) | |
| tree | 99b77b34eca35570c99966e478d58e5f24fdafe7 /android_webview | |
| parent | ee261f306c3c66e96339aa1026d62a6d953302fe (diff) | |
| download | chromium_src-f1c777e3f97a16cc6a3aa922a23602fa59412989.zip chromium_src-f1c777e3f97a16cc6a3aa922a23602fa59412989.tar.gz chromium_src-f1c777e3f97a16cc6a3aa922a23602fa59412989.tar.bz2 | |
Make NetErrorHelper more OOPIF-friendly.
Now create one per frame instead of creating them only for main frames,
and get the WebFrame directly from a WebFrame rather than by going
through the RenderView.
BUG=543226,529976
Review URL: https://codereview.chromium.org/1406303002
Cr-Commit-Position: refs/heads/master@{#356395}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.cc | 3 | ||||
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index e560711..1950e18 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -173,8 +173,7 @@ bool AwContentRendererClient::HasErrorPage(int http_status_code, } void AwContentRendererClient::GetNavigationErrorStrings( - content::RenderView* /* render_view */, - blink::WebFrame* /* frame */, + content::RenderFrame* /* render_frame */, const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h index f04a308..499c63c 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h @@ -26,8 +26,7 @@ class AwContentRendererClient : public content::ContentRendererClient { void RenderFrameCreated(content::RenderFrame* render_frame) override; void RenderViewCreated(content::RenderView* render_view) override; bool HasErrorPage(int http_status_code, std::string* error_domain) override; - void GetNavigationErrorStrings(content::RenderView* render_view, - blink::WebFrame* frame, + void GetNavigationErrorStrings(content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, |