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

Side by Side Diff: chrome/common/localized_error.cc

Issue 11884017: Show a localized and detailed error page when a page load fails due to ERR_NETWORK_CHANGED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/localized_error.h" 5 #include "chrome/common/localized_error.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED, 264 IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED,
265 SUGGEST_NONE, 265 SUGGEST_NONE,
266 }, 266 },
267 {net::ERR_BLOCKED_BY_CLIENT, 267 {net::ERR_BLOCKED_BY_CLIENT,
268 IDS_ERRORPAGES_TITLE_BLOCKED, 268 IDS_ERRORPAGES_TITLE_BLOCKED,
269 IDS_ERRORPAGES_HEADING_BLOCKED, 269 IDS_ERRORPAGES_HEADING_BLOCKED,
270 IDS_ERRORPAGES_SUMMARY_BLOCKED, 270 IDS_ERRORPAGES_SUMMARY_BLOCKED,
271 IDS_ERRORPAGES_DETAILS_BLOCKED, 271 IDS_ERRORPAGES_DETAILS_BLOCKED,
272 SUGGEST_DISABLE_EXTENSION, 272 SUGGEST_DISABLE_EXTENSION,
273 }, 273 },
274 {net::ERR_NETWORK_CHANGED,
275 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
276 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED,
277 IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED,
278 IDS_ERRORPAGES_DETAILS_NETWORK_CHANGED,
279 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION,
280 },
274 }; 281 };
275 282
276 const LocalizedErrorMap http_error_options[] = { 283 const LocalizedErrorMap http_error_options[] = {
277 {403, 284 {403,
278 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, 285 IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
279 IDS_ERRORPAGES_HEADING_ACCESS_DENIED, 286 IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
280 IDS_ERRORPAGES_SUMMARY_FORBIDDEN, 287 IDS_ERRORPAGES_SUMMARY_FORBIDDEN,
281 IDS_ERRORPAGES_DETAILS_FORBIDDEN, 288 IDS_ERRORPAGES_DETAILS_FORBIDDEN,
282 SUGGEST_NONE, 289 SUGGEST_NONE,
283 }, 290 },
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 #if defined(OS_CHROMEOS) 726 #if defined(OS_CHROMEOS)
720 GURL learn_more_url(kAppWarningLearnMoreUrl); 727 GURL learn_more_url(kAppWarningLearnMoreUrl);
721 DictionaryValue* suggest_learn_more = new DictionaryValue(); 728 DictionaryValue* suggest_learn_more = new DictionaryValue();
722 suggest_learn_more->SetString("msg", 729 suggest_learn_more->SetString("msg",
723 l10n_util::GetStringUTF16( 730 l10n_util::GetStringUTF16(
724 IDS_ERRORPAGES_SUGGESTION_LEARNMORE)); 731 IDS_ERRORPAGES_SUGGESTION_LEARNMORE));
725 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); 732 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
726 error_strings->Set("suggestionsLearnMore", suggest_learn_more); 733 error_strings->Set("suggestionsLearnMore", suggest_learn_more);
727 #endif // defined(OS_CHROMEOS) 734 #endif // defined(OS_CHROMEOS)
728 } 735 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698