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

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

Issue 10870103: Remove no longer used NetNanny and ESET anti-virus error (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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') | 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/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 17 matching lines...) Expand all
28 28
29 using WebKit::WebURLError; 29 using WebKit::WebURLError;
30 30
31 namespace { 31 namespace {
32 32
33 static const char kRedirectLoopLearnMoreUrl[] = 33 static const char kRedirectLoopLearnMoreUrl[] =
34 "https://www.google.com/support/chrome/bin/answer.py?answer=95626"; 34 "https://www.google.com/support/chrome/bin/answer.py?answer=95626";
35 static const char kWeakDHKeyLearnMoreUrl[] = 35 static const char kWeakDHKeyLearnMoreUrl[] =
36 "http://sites.google.com/a/chromium.org/dev/" 36 "http://sites.google.com/a/chromium.org/dev/"
37 "err_ssl_weak_server_ephemeral_dh_key"; 37 "err_ssl_weak_server_ephemeral_dh_key";
38 static const char kESETLearnMoreUrl[] =
39 "http://kb.eset.com/esetkb/index?page=content&id=SOLN2588";
40 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
41 static const char kAppWarningLearnMoreUrl[] = 39 static const char kAppWarningLearnMoreUrl[] =
42 "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html" 40 "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
43 "?answer=1721911"; 41 "?answer=1721911";
44 #endif // defined(OS_CHROMEOS) 42 #endif // defined(OS_CHROMEOS)
45 43
46 enum NAV_SUGGESTIONS { 44 enum NAV_SUGGESTIONS {
47 SUGGEST_NONE = 0, 45 SUGGEST_NONE = 0,
48 SUGGEST_RELOAD = 1 << 0, 46 SUGGEST_RELOAD = 1 << 0,
49 SUGGEST_HOSTNAME = 1 << 1, 47 SUGGEST_HOSTNAME = 1 << 1,
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT, 243 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
246 SUGGEST_NONE, 244 SUGGEST_NONE,
247 }, 245 },
248 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, 246 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
249 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 247 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
250 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY, 248 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY,
251 IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY, 249 IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY,
252 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, 250 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
253 SUGGEST_LEARNMORE, 251 SUGGEST_LEARNMORE,
254 }, 252 },
255 {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
256 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
257 IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
258 IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
259 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
260 SUGGEST_LEARNMORE,
261 },
262 {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, 253 {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,
263 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 254 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
264 IDS_ERRORPAGES_HEADING_PINNING_FAILURE, 255 IDS_ERRORPAGES_HEADING_PINNING_FAILURE,
265 IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE, 256 IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE,
266 IDS_ERRORPAGES_DETAILS_PINNING_FAILURE, 257 IDS_ERRORPAGES_DETAILS_PINNING_FAILURE,
267 SUGGEST_NONE, 258 SUGGEST_NONE,
268 }, 259 },
269 {net::ERR_TEMPORARILY_THROTTLED, 260 {net::ERR_TEMPORARILY_THROTTLED,
270 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, 261 IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
271 IDS_ERRORPAGES_HEADING_ACCESS_DENIED, 262 IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 629
639 if (options.suggestions & SUGGEST_LEARNMORE) { 630 if (options.suggestions & SUGGEST_LEARNMORE) {
640 GURL learn_more_url; 631 GURL learn_more_url;
641 switch (options.error_code) { 632 switch (options.error_code) {
642 case net::ERR_TOO_MANY_REDIRECTS: 633 case net::ERR_TOO_MANY_REDIRECTS:
643 learn_more_url = GURL(kRedirectLoopLearnMoreUrl); 634 learn_more_url = GURL(kRedirectLoopLearnMoreUrl);
644 break; 635 break;
645 case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: 636 case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
646 learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); 637 learn_more_url = GURL(kWeakDHKeyLearnMoreUrl);
647 break; 638 break;
648 case net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION:
649 learn_more_url = GURL(kESETLearnMoreUrl);
650 break;
651 default: 639 default:
652 break; 640 break;
653 } 641 }
654 642
655 if (learn_more_url.is_valid()) { 643 if (learn_more_url.is_valid()) {
656 // Add the language parameter to the URL. 644 // Add the language parameter to the URL.
657 std::string query = learn_more_url.query() + "&hl=" + locale; 645 std::string query = learn_more_url.query() + "&hl=" + locale;
658 GURL::Replacements repl; 646 GURL::Replacements repl;
659 repl.SetQueryStr(query); 647 repl.SetQueryStr(query);
660 learn_more_url = learn_more_url.ReplaceComponents(repl); 648 learn_more_url = learn_more_url.ReplaceComponents(repl);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 #if defined(OS_CHROMEOS) 719 #if defined(OS_CHROMEOS)
732 GURL learn_more_url(kAppWarningLearnMoreUrl); 720 GURL learn_more_url(kAppWarningLearnMoreUrl);
733 DictionaryValue* suggest_learn_more = new DictionaryValue(); 721 DictionaryValue* suggest_learn_more = new DictionaryValue();
734 suggest_learn_more->SetString("msg", 722 suggest_learn_more->SetString("msg",
735 l10n_util::GetStringUTF16( 723 l10n_util::GetStringUTF16(
736 IDS_ERRORPAGES_SUGGESTION_LEARNMORE)); 724 IDS_ERRORPAGES_SUGGESTION_LEARNMORE));
737 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); 725 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
738 error_strings->Set("suggestionsLearnMore", suggest_learn_more); 726 error_strings->Set("suggestionsLearnMore", suggest_learn_more);
739 #endif // defined(OS_CHROMEOS) 727 #endif // defined(OS_CHROMEOS)
740 } 728 }
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