diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 19:23:29 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 19:23:29 +0000 |
| commit | 73aaa740b12a1b1729d77cb6fb20b8ae6bf7fe02 (patch) | |
| tree | b7690b4604e466e9874095adee88a110c5db556b /chrome/renderer | |
| parent | f6a54262e20f8fcd23849ca5352b5d1f11cfd7bf (diff) | |
| download | chromium_src-73aaa740b12a1b1729d77cb6fb20b8ae6bf7fe02.zip chromium_src-73aaa740b12a1b1729d77cb6fb20b8ae6bf7fe02.tar.gz chromium_src-73aaa740b12a1b1729d77cb6fb20b8ae6bf7fe02.tar.bz2 | |
Adds error text for the ERR_NETWORK_ACCESS_DENIED error,
which is generally caused by a firewall.
Also removes the title strings for proxy and disconnected
errors, replacing them with pre-existing generic ones, and
sorting them by their new title. This avoids a debug
assertion caused by the fact neither title includes the url
of the original page. Not much of titles are seen anyways,
so not worth the effort of a workaround.
BUG=57108
TEST=manual
Review URL: http://codereview.chromium.org/4182012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/localized_error.cc | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index c9a2a67..f507ddd 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -79,6 +79,27 @@ const LocalizedErrorMap net_error_options[] = { IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, SUGGEST_RELOAD, }, + {net::ERR_NETWORK_ACCESS_DENIED, + IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, + IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED, + IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED, + IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED, + SUGGEST_NONE, + }, + {net::ERR_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, + IDS_ERRORPAGES_HEADING_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED, + IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED, + SUGGEST_NONE, + }, + {net::ERR_INTERNET_DISCONNECTED, + IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, + IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, + IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, + IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, + SUGGEST_NONE, + }, {net::ERR_FILE_NOT_FOUND, IDS_ERRORPAGES_TITLE_NOT_FOUND, IDS_ERRORPAGES_HEADING_NOT_FOUND, @@ -121,13 +142,6 @@ 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, - }, {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION, IDS_ERRORPAGES_TITLE_LOAD_FAILED, IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION, @@ -142,13 +156,6 @@ const LocalizedErrorMap net_error_options[] = { IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, SUGGEST_LEARNMORE, }, - {net::ERR_INTERNET_DISCONNECTED, - IDS_ERRORPAGES_TITLE_INTERNET_DISCONNECTED, - IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, - IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, - IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, - SUGGEST_NONE, - }, }; const LocalizedErrorMap http_error_options[] = { |