Chromium Code Reviews| Index: android_webview/renderer/aw_content_renderer_client.cc |
| diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc |
| index 02b1c54507c041fe3b9e89dd4792c35ce589e3aa..adf8dd41e9b0828b52e07e018aeb1ef9f1e41317 100644 |
| --- a/android_webview/renderer/aw_content_renderer_client.cc |
| +++ b/android_webview/renderer/aw_content_renderer_client.cc |
| @@ -13,6 +13,7 @@ |
| #include "components/visitedlink/renderer/visitedlink_slave.h" |
| #include "content/public/renderer/render_thread.h" |
| #include "googleurl/src/gurl.h" |
| +#include "net/base/net_errors.h" |
| #include "third_party/WebKit/public/platform/WebString.h" |
| #include "third_party/WebKit/public/platform/WebURL.h" |
| #include "third_party/WebKit/public/platform/WebURLError.h" |
| @@ -68,9 +69,15 @@ void AwContentRendererClient::GetNavigationErrorStrings( |
| std::string contents; |
| if (err.empty()) { |
| contents = AwResource::GetNoDomainPageContent(); |
| + if (error_description) { |
| + *error_description = |
| + string16(ASCIIToUTF16(net::ErrorToString(error.reason))); |
|
benm (inactive)
2013/06/04 10:24:50
is the string16 ctor needed?
mnaganov (inactive)
2013/06/04 10:43:04
Actually not, removed.
|
| + } |
| } else { |
| contents = AwResource::GetLoadErrorPageContent(); |
| ReplaceSubstringsAfterOffset(&contents, 0, "%e", err); |
| + if (error_description) |
| + *error_description = error.localizedDescription; |
| } |
| ReplaceSubstringsAfterOffset(&contents, 0, "%s", |