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

Unified Diff: chrome/common/localized_error.cc

Issue 10880048: Revert 153076 - Accidentally added unreviewed code into the CL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/localized_error.cc
===================================================================
--- chrome/common/localized_error.cc (revision 153251)
+++ chrome/common/localized_error.cc (working copy)
@@ -35,6 +35,8 @@
static const char kWeakDHKeyLearnMoreUrl[] =
"http://sites.google.com/a/chromium.org/dev/"
"err_ssl_weak_server_ephemeral_dh_key";
+static const char kESETLearnMoreUrl[] =
+ "http://kb.eset.com/esetkb/index?page=content&id=SOLN2588";
#if defined(OS_CHROMEOS)
static const char kAppWarningLearnMoreUrl[] =
"chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
@@ -250,6 +252,13 @@
IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
SUGGEST_LEARNMORE,
},
+ {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+ IDS_ERRORPAGES_TITLE_LOAD_FAILED,
+ IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+ IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+ IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
+ SUGGEST_LEARNMORE,
+ },
{net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,
IDS_ERRORPAGES_TITLE_LOAD_FAILED,
IDS_ERRORPAGES_HEADING_PINNING_FAILURE,
@@ -493,6 +502,8 @@
// displayed.
summary->SetString("failedUrl", failed_url_string);
summary->SetString("hostName", failed_url.host());
+ summary->SetString("productName",
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
error_strings->Set("summary", summary);
string16 details = l10n_util::GetStringUTF16(options.details_resource_id);
@@ -583,6 +594,8 @@
DictionaryValue* suggest_firewall_config = new DictionaryValue;
suggest_firewall_config->SetString("msg",
l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG));
+ suggest_firewall_config->SetString("productName",
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config);
}
@@ -632,6 +645,9 @@
case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
learn_more_url = GURL(kWeakDHKeyLearnMoreUrl);
break;
+ case net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION:
+ learn_more_url = GURL(kESETLearnMoreUrl);
+ break;
default:
break;
}
« 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