OLD | NEW |
---|---|
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/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
307 IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, | 307 IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, |
308 SUGGEST_CHECK_CONNECTION, | 308 SUGGEST_CHECK_CONNECTION, |
309 }, | 309 }, |
310 {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 310 {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
311 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 311 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
312 IDS_ERRORPAGES_HEADING_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 312 IDS_ERRORPAGES_HEADING_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
313 IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 313 IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
314 IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 314 IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
315 SUGGEST_LEARNMORE, | 315 SUGGEST_LEARNMORE, |
316 }, | 316 }, |
317 {net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH, | |
davidben
2014/10/29 00:32:05
Is it worth separating out the version and cipher
agl
2014/10/29 01:01:18
My feeling here is to keep this as is, although on
davidben
2014/10/29 19:19:33
Alright. I'll defer to what felt and co come with
felt
2014/10/29 19:28:18
is it worth having & maintaining very slightly dif
davidben
2014/10/29 19:34:32
Generic SGTM. I guess it depends on how specific t
| |
318 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | |
319 IDS_ERRORPAGES_HEADING_SSL_VERSION_OR_CIPHER_MISMATCH, | |
320 IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH, | |
321 IDS_ERRORPAGES_DETAILS_SSL_VERSION_OR_CIPHER_MISMATCH, | |
322 SUGGEST_NONE, | |
davidben
2014/10/29 00:32:05
Do we want to link this one to a bug as well?
agl
2014/10/29 01:01:18
I don't think so. The existing learn-more link is
davidben
2014/10/29 19:19:33
Acknowledged.
| |
323 }, | |
317 }; | 324 }; |
318 | 325 |
319 // Special error page to be used in the case of navigating back to a page | 326 // Special error page to be used in the case of navigating back to a page |
320 // generated by a POST. LocalizedError::HasStrings expects this net error code | 327 // generated by a POST. LocalizedError::HasStrings expects this net error code |
321 // to also appear in the array above. | 328 // to also appear in the array above. |
322 const LocalizedErrorMap repost_error = { | 329 const LocalizedErrorMap repost_error = { |
323 net::ERR_CACHE_MISS, | 330 net::ERR_CACHE_MISS, |
324 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 331 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
325 IDS_HTTP_POST_WARNING_TITLE, | 332 IDS_HTTP_POST_WARNING_TITLE, |
326 IDS_ERRORPAGES_HTTP_POST_WARNING, | 333 IDS_ERRORPAGES_HTTP_POST_WARNING, |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
884 GURL learn_more_url(kAppWarningLearnMoreUrl); | 891 GURL learn_more_url(kAppWarningLearnMoreUrl); |
885 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue(); | 892 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue(); |
886 suggest_learn_more->SetString("msg", | 893 suggest_learn_more->SetString("msg", |
887 l10n_util::GetStringUTF16( | 894 l10n_util::GetStringUTF16( |
888 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); | 895 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); |
889 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); | 896 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); |
890 error_strings->Set("suggestionsLearnMore", suggest_learn_more); | 897 error_strings->Set("suggestionsLearnMore", suggest_learn_more); |
891 #endif // defined(OS_CHROMEOS) | 898 #endif // defined(OS_CHROMEOS) |
892 } | 899 } |
893 #endif | 900 #endif |
OLD | NEW |