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

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

Issue 1002283005: Add an error page for net::ERR_ICANN_NAME_COLLISION. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dns_53
Patch Set: rebase (dependent change now landed) Created 5 years, 9 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
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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 SUGGEST_RELOAD, 130 SUGGEST_RELOAD,
131 }, 131 },
132 {net::ERR_NAME_NOT_RESOLVED, 132 {net::ERR_NAME_NOT_RESOLVED,
133 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 133 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
134 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, 134 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
135 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, 135 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED,
136 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, 136 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
137 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_DNS_CONFIG | 137 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_DNS_CONFIG |
138 SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG, 138 SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG,
139 }, 139 },
140 {net::ERR_ICANN_NAME_COLLISION,
141 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
142 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
143 IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION,
144 IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION,
145 SUGGEST_NONE,
146 },
140 {net::ERR_ADDRESS_UNREACHABLE, 147 {net::ERR_ADDRESS_UNREACHABLE,
141 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 148 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
142 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, 149 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
143 IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE, 150 IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE,
144 IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE, 151 IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE,
145 SUGGEST_RELOAD | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG, 152 SUGGEST_RELOAD | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG,
146 }, 153 },
147 {net::ERR_NETWORK_ACCESS_DENIED, 154 {net::ERR_NETWORK_ACCESS_DENIED,
148 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 155 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
149 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED, 156 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED,
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 GURL learn_more_url(kAppWarningLearnMoreUrl); 920 GURL learn_more_url(kAppWarningLearnMoreUrl);
914 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue(); 921 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
915 suggest_learn_more->SetString("msg", 922 suggest_learn_more->SetString("msg",
916 l10n_util::GetStringUTF16( 923 l10n_util::GetStringUTF16(
917 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); 924 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
918 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); 925 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
919 error_strings->Set("suggestionsLearnMore", suggest_learn_more); 926 error_strings->Set("suggestionsLearnMore", suggest_learn_more);
920 #endif // defined(OS_CHROMEOS) 927 #endif // defined(OS_CHROMEOS)
921 } 928 }
922 #endif 929 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698