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

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

Issue 1151833004: Remove ERR_SSL_UNSAFE_NEGOTIATION error code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | net/base/net_error_list.h » ('j') | 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/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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED, 249 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED,
250 SUGGEST_RELOAD, 250 SUGGEST_RELOAD,
251 }, 251 },
252 {net::ERR_SSL_PROTOCOL_ERROR, 252 {net::ERR_SSL_PROTOCOL_ERROR,
253 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 253 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
254 IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR, 254 IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR,
255 IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR, 255 IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR,
256 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, 256 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
257 SUGGEST_NONE, 257 SUGGEST_NONE,
258 }, 258 },
259 {net::ERR_SSL_UNSAFE_NEGOTIATION,
260 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
261 IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR,
262 IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR,
263 IDS_ERRORPAGES_DETAILS_SSL_UNSAFE_NEGOTIATION,
264 SUGGEST_NONE,
265 },
266 {net::ERR_BAD_SSL_CLIENT_AUTH_CERT, 259 {net::ERR_BAD_SSL_CLIENT_AUTH_CERT,
267 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 260 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
268 IDS_ERRORPAGES_HEADING_BAD_SSL_CLIENT_AUTH_CERT, 261 IDS_ERRORPAGES_HEADING_BAD_SSL_CLIENT_AUTH_CERT,
269 IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT, 262 IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT,
270 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT, 263 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
271 SUGGEST_NONE, 264 SUGGEST_NONE,
272 }, 265 },
273 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, 266 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
274 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 267 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
275 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY, 268 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY,
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 GURL learn_more_url(kAppWarningLearnMoreUrl); 913 GURL learn_more_url(kAppWarningLearnMoreUrl);
921 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue(); 914 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
922 suggest_learn_more->SetString("msg", 915 suggest_learn_more->SetString("msg",
923 l10n_util::GetStringUTF16( 916 l10n_util::GetStringUTF16(
924 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); 917 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
925 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); 918 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
926 error_strings->Set("suggestionsLearnMore", suggest_learn_more); 919 error_strings->Set("suggestionsLearnMore", suggest_learn_more);
927 #endif // defined(OS_CHROMEOS) 920 #endif // defined(OS_CHROMEOS)
928 } 921 }
929 #endif 922 #endif
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | net/base/net_error_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698