diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 19:51:55 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 19:51:55 +0000 |
| commit | 3755c3d37ba23b85e8117d2f0171972e91ffef57 (patch) | |
| tree | f9b0ca70f6ff8b522919ca27b8b0dadac472b9d0 /chrome/renderer | |
| parent | 8ea7a167522a24be192e958af46a41d49e78504c (diff) | |
| download | chromium_src-3755c3d37ba23b85e8117d2f0171972e91ffef57.zip chromium_src-3755c3d37ba23b85e8117d2f0171972e91ffef57.tar.gz chromium_src-3755c3d37ba23b85e8117d2f0171972e91ffef57.tar.bz2 | |
Initial pass for proxy server error message change.
CL began its life under rdsmith (http://codereview.chromium.org/3548001/show).
BUG=55728
TEST=Run chrome with invalid proxy server and examine navigation error message.
Review URL: http://codereview.chromium.org/3521010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/localized_error.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index 216992b..fa6b70c 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -13,6 +13,7 @@ #include "base/values.h" #include "chrome/renderer/extensions/extension_renderer_info.h" #include "googleurl/src/gurl.h" +#include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" @@ -122,6 +123,13 @@ const LocalizedErrorMap net_error_options[] = { IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, SUGGEST_LEARNMORE, }, + {net::ERR_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_TITLE_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_HEADING_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED, + SUGGEST_NONE, + }, }; const LocalizedErrorMap http_error_options[] = { @@ -321,12 +329,25 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, l10n_util::GetStringUTF16(options.summary_resource_id)); // TODO(tc): we want the unicode url here since it's being displayed summary->SetString("failedUrl", failed_url); + summary->SetString("productName", + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); error_strings->Set("summary", summary); string16 details = l10n_util::GetStringUTF16(options.details_resource_id); error_strings->SetString("details", GetErrorDetailsString(error_domain, error_code, details)); + // Any special case processing that needs to happen for particular + // errors (hack). + if (error_domain == net::kErrorDomain && + error_code == net::ERR_PROXY_CONNECTION_FAILED) { + // Suffix the platform dependent portion of the summary section. + summary->SetString("msg", + l10n_util::GetStringFUTF16(options.summary_resource_id, + l10n_util::GetStringUTF16( + IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED_PLATFORM))); + } + if (options.suggestions & SUGGEST_RELOAD) { DictionaryValue* suggest_reload = new DictionaryValue; suggest_reload->SetString("msg", |