Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/error_page/common/localized_error.cc

Issue 2214393003: Change network error titles to just the hostname (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | components/error_page_strings.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/error_page/common/localized_error.cc
diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc
index fd4be4a3072f67510fcb5af340b5268a6e96ac53..348664a44d1b38988cc3adc849ea69bb3876dee2 100644
--- a/components/error_page/common/localized_error.cc
+++ b/components/error_page/common/localized_error.cc
@@ -73,7 +73,6 @@ enum SHOW_BUTTONS {
struct LocalizedErrorMap {
int error_code;
- unsigned int title_resource_id;
unsigned int heading_resource_id;
// Detailed summary used when the error is in the main frame and shown on
// mouse over when the error is in a frame.
@@ -84,7 +83,6 @@ struct LocalizedErrorMap {
const LocalizedErrorMap net_error_options[] = {
{net::ERR_TIMED_OUT,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_TIMED_OUT,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
@@ -92,7 +90,6 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONNECTION_TIMED_OUT,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_TIMED_OUT,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
@@ -100,7 +97,6 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONNECTION_CLOSED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
@@ -108,7 +104,6 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONNECTION_RESET,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
@@ -116,21 +111,18 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONNECTION_REFUSED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_REFUSED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG,
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONNECTION_FAILED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_FAILED,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
{net::ERR_NAME_NOT_RESOLVED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
SUGGEST_CHECK_CONNECTION | SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG |
@@ -138,21 +130,18 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{net::ERR_ICANN_NAME_COLLISION,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{net::ERR_ADDRESS_UNREACHABLE,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
{net::ERR_NETWORK_ACCESS_DENIED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED,
IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG |
@@ -160,196 +149,168 @@ const LocalizedErrorMap net_error_options[] = {
SHOW_NO_BUTTONS,
},
{net::ERR_PROXY_CONNECTION_FAILED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED,
SUGGEST_PROXY_CONFIG | SUGGEST_CONTACT_ADMINISTRATOR | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
{net::ERR_INTERNET_DISCONNECTED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
SUGGEST_OFFLINE_CHECKS | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
{net::ERR_FILE_NOT_FOUND,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_FILE_NOT_FOUND,
IDS_ERRORPAGES_SUMMARY_FILE_NOT_FOUND,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{net::ERR_CACHE_MISS,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE,
IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_CACHE_READ_FAILURE,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE,
IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_NETWORK_IO_SUSPENDED,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED,
IDS_ERRORPAGES_SUMMARY_NETWORK_IO_SUSPENDED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_TOO_MANY_REDIRECTS,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_TOO_MANY_REDIRECTS,
SUGGEST_LEARNMORE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_EMPTY_RESPONSE,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_EMPTY_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_RESPONSE_HEADERS_MULTIPLE_LOCATION,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_INVALID_HTTP_RESPONSE,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_CONTENT_LENGTH_MISMATCH,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_INCOMPLETE_CHUNKED_ENCODING,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_SSL_PROTOCOL_ERROR,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
{net::ERR_BAD_SSL_CLIENT_AUTH_CERT,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT,
SUGGEST_CONTACT_ADMINISTRATOR,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR,
SUGGEST_LEARNMORE,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{net::ERR_TEMPORARILY_THROTTLED,
- IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
SUGGEST_DISABLE_EXTENSION,
SHOW_NO_BUTTONS,
},
{net::ERR_BLOCKED_BY_CLIENT,
- IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_BLOCKED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_EXTENSION,
SUGGEST_DISABLE_EXTENSION,
SHOW_BUTTON_RELOAD,
},
{net::ERR_NETWORK_CHANGED,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED,
IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{net::ERR_BLOCKED_BY_ADMINISTRATOR,
- IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_BLOCKED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR,
SUGGEST_CONTACT_ADMINISTRATOR,
SHOW_NO_BUTTONS,
},
{net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING,
- IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_ENROLLMENT_CHECK_PENDING,
SUGGEST_COMPLETE_SETUP,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH,
SUGGEST_UNSUPPORTED_CIPHER,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_OBSOLETE_CIPHER,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH,
SUGGEST_UNSUPPORTED_CIPHER,
SHOW_NO_BUTTONS,
},
{net::ERR_TEMPORARY_BACKOFF,
- IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
IDS_ERRORPAGES_SUMMARY_TEMPORARY_BACKOFF,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{net::ERR_SSL_SERVER_CERT_BAD_FORMAT,
- IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR,
SUGGEST_NONE,
@@ -362,7 +323,6 @@ const LocalizedErrorMap net_error_options[] = {
// to also appear in the array above.
const LocalizedErrorMap repost_error = {
net::ERR_CACHE_MISS,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_HTTP_POST_WARNING_TITLE,
IDS_ERRORPAGES_HTTP_POST_WARNING,
SUGGEST_REPOST_RELOAD,
@@ -371,46 +331,40 @@ const LocalizedErrorMap repost_error = {
const LocalizedErrorMap http_error_options[] = {
{
- 403, IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
- IDS_ERRORPAGES_HEADING_ACCESS_DENIED, IDS_ERRORPAGES_SUMMARY_FORBIDDEN,
- SUGGEST_NONE, SHOW_BUTTON_RELOAD,
+ 403, IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
+ IDS_ERRORPAGES_SUMMARY_FORBIDDEN, SUGGEST_NONE, SHOW_BUTTON_RELOAD,
},
{
- 404, IDS_ERRORPAGES_TITLE_NOT_FOUND, IDS_ERRORPAGES_HEADING_NOT_FOUND,
- IDS_ERRORPAGES_SUMMARY_NOT_FOUND, SUGGEST_NONE, SHOW_BUTTON_RELOAD,
+ 404, IDS_ERRORPAGES_HEADING_NOT_FOUND, IDS_ERRORPAGES_SUMMARY_NOT_FOUND,
+ SUGGEST_NONE, SHOW_BUTTON_RELOAD,
},
{
- 410, IDS_ERRORPAGES_TITLE_NOT_FOUND, IDS_ERRORPAGES_HEADING_NOT_FOUND,
- IDS_ERRORPAGES_SUMMARY_GONE, SUGGEST_NONE, SHOW_NO_BUTTONS,
+ 410, IDS_ERRORPAGES_HEADING_NOT_FOUND, IDS_ERRORPAGES_SUMMARY_GONE,
+ SUGGEST_NONE, SHOW_NO_BUTTONS,
},
{
- 500, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
- IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
+ 500, IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST, SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{
- 501, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
- IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
+ 501, IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST, SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
{
- 502, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
- IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
+ 502, IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST, SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{
- 503, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
- IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
+ 503, IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST, SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
{
- 504, IDS_ERRORPAGES_TITLE_LOAD_FAILED,
- IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
+ 504, IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_GATEWAY_TIMEOUT, SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -418,7 +372,6 @@ const LocalizedErrorMap http_error_options[] = {
const LocalizedErrorMap dns_probe_error_options[] = {
{error_page::DNS_PROBE_POSSIBLE,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
SUGGEST_DIAGNOSE_TOOL,
@@ -429,7 +382,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
// error, which might be one of several DNS-related errors.
{error_page::DNS_PROBE_STARTED,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
// Include SUGGEST_RELOAD so the More button doesn't jump when we update.
@@ -441,14 +393,12 @@ const LocalizedErrorMap dns_probe_error_options[] = {
// original error, which might be one of several DNS-related errors.
{error_page::DNS_PROBE_FINISHED_NO_INTERNET,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
SUGGEST_OFFLINE_CHECKS | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
{error_page::DNS_PROBE_FINISHED_BAD_CONFIG,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
@@ -456,7 +406,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
SHOW_BUTTON_RELOAD,
},
{error_page::DNS_PROBE_FINISHED_NXDOMAIN,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
SUGGEST_DIAGNOSE_TOOL,
@@ -880,7 +829,6 @@ void LocalizedError::GetStrings(
// options with default values.
LocalizedErrorMap options = {
0,
- IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
SUGGEST_NONE,
@@ -899,7 +847,6 @@ void LocalizedError::GetStrings(
if (error_domain == net::kErrorDomain &&
error_code == net::ERR_ACCESS_DENIED &&
failed_url.scheme() == "file") {
- options.title_resource_id = IDS_ERRORPAGES_TITLE_ACCESS_DENIED;
options.heading_resource_id = IDS_ERRORPAGES_HEADING_FILE_ACCESS_DENIED;
options.summary_resource_id = IDS_ERRORPAGES_SUMMARY_FILE_ACCESS_DENIED;
options.suggestions = SUGGEST_NONE;
@@ -912,12 +859,15 @@ void LocalizedError::GetStrings(
// URLs are always LTR.
if (base::i18n::IsRTL())
base::i18n::WrapStringWithLTRFormatting(&failed_url_string);
- error_strings->SetString("title",
- l10n_util::GetStringFUTF16(options.title_resource_id, failed_url_string));
- std::string icon_class = GetIconClassForError(error_domain, error_code);
- error_strings->SetString("iconClass", icon_class);
base::string16 host_name(url_formatter::IDNToUnicode(failed_url.host()));
+ if (failed_url.SchemeIsHTTPOrHTTPS())
+ error_strings->SetString("title", host_name);
+ else
+ error_strings->SetString("title", failed_url_string);
+
+ std::string icon_class = GetIconClassForError(error_domain, error_code);
+ error_strings->SetString("iconClass", icon_class);
base::DictionaryValue* heading = new base::DictionaryValue;
heading->SetString("msg",
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | components/error_page_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698