diff options
| author | ttuttle@chromium.org <ttuttle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 05:15:53 +0000 |
|---|---|---|
| committer | ttuttle@chromium.org <ttuttle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 05:15:53 +0000 |
| commit | 8da4d260e9ed12d6232d6c329f8869614082d962 (patch) | |
| tree | 8332fa59e62786f86146a8425d00cb609f64cf72 /android_webview/renderer | |
| parent | 70f06bdedd34daa32acb247f5286e6cbd02e3e8a (diff) | |
| download | chromium_src-8da4d260e9ed12d6232d6c329f8869614082d962.zip chromium_src-8da4d260e9ed12d6232d6c329f8869614082d962.tar.gz chromium_src-8da4d260e9ed12d6232d6c329f8869614082d962.tar.bz2 | |
Add frame parameter to GetNavigationErrorStrings.
The last bit of the renderer-side changes to enable the new DNS error pages
will use this to ensure it only provides altered error page strings to main
frame errors.
BUG=156415
Review URL: https://chromiumcodereview.appspot.com/14081013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/renderer')
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.cc | 1 | ||||
| -rw-r--r-- | android_webview/renderer/aw_content_renderer_client.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index d37ba2d..9429c96 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -62,6 +62,7 @@ bool AwContentRendererClient::HasErrorPage(int http_status_code, } void AwContentRendererClient::GetNavigationErrorStrings( + WebKit::WebFrame* /* frame */, const WebKit::WebURLRequest& failed_request, const WebKit::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 f224d5e..ba5a700 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h @@ -32,6 +32,7 @@ class AwContentRendererClient : public content::ContentRendererClient { virtual bool HasErrorPage(int http_status_code, std::string* error_domain) OVERRIDE; virtual void GetNavigationErrorStrings( + WebKit::WebFrame* frame, const WebKit::WebURLRequest& failed_request, const WebKit::WebURLError& error, std::string* error_html, |