diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-20 15:55:18 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-20 15:55:18 +0000 |
| commit | 75891fe5e8c0dc1696cc155a619687624397c894 (patch) | |
| tree | 2d06964d997d4efbb3c767c0b76a556ef13f87c9 /chrome/renderer | |
| parent | d021d84ea3e028cf49c6d9c69ee3854e4c1e1be7 (diff) | |
| download | chromium_src-75891fe5e8c0dc1696cc155a619687624397c894.zip chromium_src-75891fe5e8c0dc1696cc155a619687624397c894.tar.gz chromium_src-75891fe5e8c0dc1696cc155a619687624397c894.tar.bz2 | |
Modify neterror.html so that it can handle errors without
any details. Remove error_no_details.html, as it's no
longer needed.
Only issues were using i18n-content for the details and a
little extra whitespace.
BUG=59096
TEST=manual
Review URL: http://codereview.chromium.org/5191004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/localized_error.cc | 8 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/renderer_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/renderer/resources/error_no_details.html | 81 | ||||
| -rw-r--r-- | chrome/renderer/resources/neterror.html | 7 |
5 files changed, 8 insertions, 92 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index 32cd8ae..d2afe31 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -328,12 +328,11 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, if (error_map) options = *error_map; - string16 suggestions_heading; if (options.suggestions != SUGGEST_NONE) { - suggestions_heading = - l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING); + error_strings->SetString( + "suggestionsHeading", + l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING)); } - error_strings->SetString("suggestionsHeading", suggestions_heading); string16 failed_url(ASCIIToUTF16(error.unreachableURL.spec())); // URLs are always LTR. @@ -490,7 +489,6 @@ void LocalizedError::GetFormRepostStrings(const GURL& display_url, failed_url)); error_strings->SetString( "heading", l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_TITLE)); - error_strings->SetString("suggestionsHeading", ""); DictionaryValue* summary = new DictionaryValue; summary->SetString( "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_HTTP_POST_WARNING)); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 55274b4..92eb1bd 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1705,11 +1705,10 @@ void RenderView::LoadNavigationErrorPage(WebFrame* frame, error.reason == net::ERR_CACHE_MISS && EqualsASCII(failed_request.httpMethod(), "POST")) { LocalizedError::GetFormRepostStrings(failed_url, &error_strings); - resource_id = IDR_ERROR_NO_DETAILS_HTML; } else { LocalizedError::GetStrings(error, &error_strings); - resource_id = IDR_NET_ERROR_HTML; } + resource_id = IDR_NET_ERROR_HTML; } alt_html = GetAltHTMLForTemplate(error_strings, resource_id); diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 9fddc4b..b63b367 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -14,7 +14,6 @@ without changes to the corresponding grd file. fb9 --> <include name="IDR_BASE_JS" file="resources\base.js" type="BINDATA" /> <include name="IDR_BLOCKED_PLUGIN_HTML" file="resources\blocked_plugin.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_DOM_AUTOMATION_JS" file="resources\dom_automation.js" type="BINDATA" /> - <include name="IDR_ERROR_NO_DETAILS_HTML" file="resources\error_no_details.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_EVENT_BINDINGS_JS" file="resources\event_bindings.js" type="BINDATA" /> <include name="IDR_EXTENSION_APITEST_JS" file="resources\extension_apitest.js" type="BINDATA" /> <include name="IDR_EXTENSION_PROCESS_BINDINGS_JS" file="resources\extension_process_bindings.js" type="BINDATA" /> diff --git a/chrome/renderer/resources/error_no_details.html b/chrome/renderer/resources/error_no_details.html deleted file mode 100644 index 1687490..0000000 --- a/chrome/renderer/resources/error_no_details.html +++ /dev/null @@ -1,81 +0,0 @@ -<!DOCTYPE html> -<html id="t" i18n-values="dir:textdirection"> -<head> -<title i18n-content="title"> -</title> -<style> -body { - background-color: #fff; - color: #000; - font-family: Helvetica, Arial, sans-serif; - font-size: 83%; - line-height: 120%; - max-width: 35em; - padding: 0.5em 1em; -} -li { - padding-bottom: .3em; -} -ul { - margin: .5em 0 0; - padding-bottom: 0; -} -h1 { - font-size: 1.5em; - margin-bottom: 1.5em; -} -h2 { - font-size: 1em; - font-weight: bold; - margin: 0 0 .5em; - padding: 0; -} -a { - color: #00c; -} -a:active { - color: #f00; -} -a:visited { - color: #551a8b; -} -#errorSummary, #suggestions, #search { - margin-bottom: 2.5em; -} -</style> -</head> -<body> - -<h1 i18n-content="heading"></h1> - -<div id="errorSummary" jsselect="summary"> - <p jsvalues=".innerHTML:msg"></p> -</div> - -<div id="suggestions"> - <h2 i18n-content="suggestionsHeading"></h2> - <ul> - <li jsselect="suggestionsReload"> - <span jsvalues=".innerHTML:msg"></span> - </li> - <li jsselect="suggestionsHomepage"> - <span jscontent="suggestionsHomepageMsg"></span> - <a jscontent="hostName" jsvalues="href:homePage"></a> - </li> - <li jsselect="suggestionsFirewallConfig"> - <span jsvalues=".innerHTML:msg"></span> - </li> - <li jsselect="suggestionsProxyConfig"> - <span jsvalues=".innerHTML:msg"></span> - </li> - <li jsselect="suggestionsProxyDisable"> - <span jsvalues=".innerHTML:msg"></span> - </li> - <li jsselect="suggestionsLearnMore"> - <span jsvalues=".innerHTML:msg"></span> - </li> - </ul> -</div> - -</body> -</html> diff --git a/chrome/renderer/resources/neterror.html b/chrome/renderer/resources/neterror.html index f40ba02..b017f48 100644 --- a/chrome/renderer/resources/neterror.html +++ b/chrome/renderer/resources/neterror.html @@ -113,9 +113,10 @@ if (window.screen.colorDepth >= 24) </h1> <div id="errorSummary" jsselect="summary"> - <p jsvalues=".innerHTML:msg"></div> + <span jsvalues=".innerHTML:msg"></span> + </div> - <div id="suggestions"> + <div id="suggestions" jsdisplay="suggestionsHeading"> <h2 i18n-content="suggestionsHeading"></h2> <ul> <li jsselect="suggestionsReload"> @@ -140,7 +141,7 @@ if (window.screen.colorDepth >= 24) </ul> </div> - <div id="errorDetails" i18n-content="details"></div> + <div id="errorDetails" jsselect="details" jscontent="$this"></div> </div> </div> </body> |