diff options
| author | yuusuke@yandex-team.ru <yuusuke@yandex-team.ru@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 16:01:38 +0000 |
|---|---|---|
| committer | yuusuke@yandex-team.ru <yuusuke@yandex-team.ru@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 16:01:38 +0000 |
| commit | b38806a8ad4ecb73bfffaecfaab28a1dfe3a5402 (patch) | |
| tree | cd732770b8668a68ad18d981255ac331fbdf9d0d /android_webview | |
| parent | 8b2180946a26199bb28309ae585fe7a314dfcd4e (diff) | |
| download | chromium_src-b38806a8ad4ecb73bfffaecfaab28a1dfe3a5402.zip chromium_src-b38806a8ad4ecb73bfffaecfaab28a1dfe3a5402.tar.gz chromium_src-b38806a8ad4ecb73bfffaecfaab28a1dfe3a5402.tar.bz2 | |
Show IDN in error screens (DNS failure etc.)
BUG=2351
TEST=Visit unavailable IDN site and check no punycode is displayed in error screen.
Review URL: https://codereview.chromium.org/24503004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -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 92e3625..a4798b06 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -67,6 +67,7 @@ void AwContentRendererClient::GetNavigationErrorStrings( WebKit::WebFrame* /* frame */, const WebKit::WebURLRequest& failed_request, const WebKit::WebURLError& error, + const std::string& accept_languages, std::string* error_html, string16* error_description) { if (error_html) { diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h index 73418d7..c4d0f47 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h @@ -31,6 +31,7 @@ class AwContentRendererClient : public content::ContentRendererClient { WebKit::WebFrame* frame, const WebKit::WebURLRequest& failed_request, const WebKit::WebURLError& error, + const std::string& accept_languages, std::string* error_html, string16* error_description) OVERRIDE; virtual unsigned long long VisitedLinkHash(const char* canonical_url, |