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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2094733002: Remove details strings used by iframes on network error pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix errorpage tests Created 4 years, 6 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 | « no previous file | components/error_page_strings.grdp » ('j') | components/error_page_strings.grdp » ('J')
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 59a0f1e40b8dcb6aaac46887bd04feadd3fb0218..7ff422b387b95a77fc310076294f8379e72ba6fb 100644
--- a/components/error_page/common/localized_error.cc
+++ b/components/error_page/common/localized_error.cc
@@ -79,11 +79,9 @@ 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.
+ // Detailed summary used when the error is in the main frame and shown on
+ // mouse over when the error is in a frame.
unsigned int summary_resource_id;
- // Short one sentence description shown on mouse over when the error is in
- // a frame.
- unsigned int details_resource_id;
int suggestions; // Bitmap of SUGGEST_* values.
int buttons; // Which buttons if any to show.
};
@@ -93,7 +91,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_TIMED_OUT,
- IDS_ERRORPAGES_DETAILS_TIMED_OUT,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -102,7 +99,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_TIMED_OUT,
- IDS_ERRORPAGES_DETAILS_TIMED_OUT,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -111,7 +107,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
- IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -120,7 +115,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET,
- IDS_ERRORPAGES_DETAILS_CONNECTION_RESET,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -129,7 +123,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_REFUSED,
- IDS_ERRORPAGES_DETAILS_CONNECTION_REFUSED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG,
SHOW_BUTTON_RELOAD,
},
@@ -137,7 +130,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_CONNECTION_FAILED,
- IDS_ERRORPAGES_DETAILS_CONNECTION_FAILED,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
@@ -145,7 +137,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
- IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
SUGGEST_CHECK_CONNECTION | SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG |
SUGGEST_PROXY_CONFIG | SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -154,7 +145,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION,
- IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -162,7 +152,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE,
- IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
@@ -170,7 +159,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED,
IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED,
- IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED,
SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG |
SUGGEST_ANTIVIRUS_CONFIG | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
@@ -179,7 +167,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED,
- IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED,
SUGGEST_PROXY_CONFIG | SUGGEST_CONTACT_ADMINISTRATOR | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
@@ -187,7 +174,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
kEmptyMessageResourceID,
- IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED,
SUGGEST_OFFLINE_CHECKS | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
@@ -195,7 +181,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_FILE_NOT_FOUND,
IDS_ERRORPAGES_SUMMARY_FILE_NOT_FOUND,
- IDS_ERRORPAGES_DETAILS_FILE_NOT_FOUND,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -203,7 +188,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE,
IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE,
- IDS_ERRORPAGES_DETAILS_CACHE_READ_FAILURE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -211,7 +195,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE,
IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE,
- IDS_ERRORPAGES_DETAILS_CACHE_READ_FAILURE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -219,7 +202,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED,
IDS_ERRORPAGES_SUMMARY_NETWORK_IO_SUSPENDED,
- IDS_ERRORPAGES_DETAILS_NETWORK_IO_SUSPENDED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -227,7 +209,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_TOO_MANY_REDIRECTS,
- IDS_ERRORPAGES_DETAILS_TOO_MANY_REDIRECTS,
SUGGEST_LEARNMORE,
SHOW_BUTTON_RELOAD,
},
@@ -235,7 +216,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_EMPTY_RESPONSE,
- IDS_ERRORPAGES_DETAILS_EMPTY_RESPONSE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -243,7 +223,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
- IDS_ERRORPAGES_DETAILS_RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -251,7 +230,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
- IDS_ERRORPAGES_DETAILS_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -259,7 +237,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
- IDS_ERRORPAGES_DETAILS_RESPONSE_HEADERS_MULTIPLE_LOCATION,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -267,7 +244,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
- IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -275,7 +251,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED,
- IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -283,7 +258,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
- IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
@@ -291,7 +265,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT,
- IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
SUGGEST_CONTACT_ADMINISTRATOR,
SHOW_NO_BUTTONS,
},
@@ -299,7 +272,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR,
- IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_LEARNMORE,
SHOW_NO_BUTTONS,
},
@@ -307,7 +279,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS,
- IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -315,7 +286,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
- IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED,
SUGGEST_DISABLE_EXTENSION,
SHOW_NO_BUTTONS,
},
@@ -323,7 +293,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_BLOCKED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_EXTENSION,
- IDS_ERRORPAGES_DETAILS_BLOCKED_BY_EXTENSION,
SUGGEST_DISABLE_EXTENSION,
SHOW_BUTTON_RELOAD,
},
@@ -331,7 +300,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED,
IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED,
- IDS_ERRORPAGES_DETAILS_NETWORK_CHANGED,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -339,7 +307,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_BLOCKED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR,
- IDS_ERRORPAGES_DETAILS_BLOCKED_BY_ADMINISTRATOR,
SUGGEST_CONTACT_ADMINISTRATOR,
SHOW_NO_BUTTONS,
},
@@ -347,7 +314,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_BLOCKED,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
IDS_ERRORPAGES_SUMMARY_BLOCKED_ENROLLMENT_CHECK_PENDING,
- IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING,
SUGGEST_COMPLETE_SETUP,
SHOW_NO_BUTTONS,
},
@@ -355,7 +321,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE,
- IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -363,7 +328,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH,
- IDS_ERRORPAGES_DETAILS_SSL_VERSION_OR_CIPHER_MISMATCH,
SUGGEST_UNSUPPORTED_CIPHER,
SHOW_NO_BUTTONS,
},
@@ -371,7 +335,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
IDS_ERRORPAGES_SUMMARY_TEMPORARY_BACKOFF,
- IDS_ERRORPAGES_DETAILS_TEMPORARY_BACKOFF,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -379,7 +342,6 @@ const LocalizedErrorMap net_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION,
IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR,
- IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -393,7 +355,6 @@ const LocalizedErrorMap repost_error = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_HTTP_POST_WARNING_TITLE,
IDS_ERRORPAGES_HTTP_POST_WARNING,
- IDS_ERRORPAGES_DETAILS_CACHE_READ_FAILURE,
SUGGEST_REPOST_RELOAD,
SHOW_NO_BUTTONS,
};
@@ -403,7 +364,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
IDS_ERRORPAGES_SUMMARY_FORBIDDEN,
- IDS_ERRORPAGES_DETAILS_FORBIDDEN,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -411,7 +371,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_FOUND,
IDS_ERRORPAGES_HEADING_NOT_FOUND,
IDS_ERRORPAGES_SUMMARY_GONE,
- IDS_ERRORPAGES_DETAILS_GONE,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -420,7 +379,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST,
- IDS_ERRORPAGES_DETAILS_INTERNAL_SERVER_ERROR,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -428,7 +386,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST,
- IDS_ERRORPAGES_DETAILS_NOT_IMPLEMENTED,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
},
@@ -436,7 +393,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST,
- IDS_ERRORPAGES_DETAILS_BAD_GATEWAY,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -444,7 +400,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST,
- IDS_ERRORPAGES_DETAILS_SERVICE_UNAVAILABLE,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -452,7 +407,6 @@ const LocalizedErrorMap http_error_options[] = {
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING,
IDS_ERRORPAGES_SUMMARY_GATEWAY_TIMEOUT,
- IDS_ERRORPAGES_DETAILS_GATEWAY_TIMEOUT,
SUGGEST_NONE,
SHOW_BUTTON_RELOAD,
},
@@ -463,7 +417,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
- IDS_ERRORPAGES_DETAILS_DNS_PROBE_RUNNING,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
@@ -475,7 +428,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING,
- IDS_ERRORPAGES_DETAILS_DNS_PROBE_RUNNING,
// Include SUGGEST_RELOAD so the More button doesn't jump when we update.
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -488,7 +440,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
kEmptyMessageResourceID,
- IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED,
SUGGEST_OFFLINE_CHECKS | SUGGEST_DIAGNOSE_TOOL,
SHOW_NO_BUTTONS,
},
@@ -496,7 +447,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
- IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG |
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
@@ -505,7 +455,6 @@ const LocalizedErrorMap dns_probe_error_options[] = {
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
- IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
SUGGEST_DIAGNOSE_TOOL,
SHOW_BUTTON_RELOAD,
},
@@ -930,7 +879,6 @@ void LocalizedError::GetStrings(
IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
- kEmptyMessageResourceID,
SUGGEST_NONE,
SHOW_NO_BUTTONS,
};
@@ -950,7 +898,6 @@ void LocalizedError::GetStrings(
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.details_resource_id = IDS_ERRORPAGES_DETAILS_FILE_ACCESS_DENIED;
options.suggestions = SUGGEST_NONE;
options.buttons = SHOW_BUTTON_RELOAD;
}
@@ -1007,12 +954,6 @@ void LocalizedError::GetStrings(
IDS_ERRORPAGE_NET_BUTTON_HIDE_DETAILS));
error_strings->Set("summary", summary);
- error_strings->SetString(
- "errorDetails",
- options.details_resource_id != kEmptyMessageResourceID
- ? l10n_util::GetStringUTF16(options.details_resource_id)
- : base::string16());
-
base::string16 error_string;
if (error_domain == net::kErrorDomain) {
// Non-internationalized error string, for debugging Chrome itself.
@@ -1122,8 +1063,8 @@ base::string16 LocalizedError::GetErrorDetails(const std::string& error_domain,
bool is_post) {
const LocalizedErrorMap* error_map =
LookupErrorMap(error_domain, error_code, is_post);
- if (error_map)
- return l10n_util::GetStringUTF16(error_map->details_resource_id);
+ if (error_map && error_map->summary_resource_id != kEmptyMessageResourceID)
mmenke 2016/06/23 19:04:30 Seems weird not to have any text on ERR_INTERNET_D
edwardjung 2016/06/27 11:11:57 Rachel and I felt there wasn't anything to add to
+ return l10n_util::GetStringUTF16(error_map->summary_resource_id);
else
return l10n_util::GetStringUTF16(IDS_ERRORPAGES_DETAILS_UNKNOWN);
mmenke 2016/06/23 19:04:30 Seems like we should remove this one, too, and use
edwardjung 2016/06/27 11:11:57 Done.
}
« no previous file with comments | « no previous file | components/error_page_strings.grdp » ('j') | components/error_page_strings.grdp » ('J')

Powered by Google App Engine
This is Rietveld 408576698