| Index: chrome/renderer/localized_error.cc
|
| diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
|
| index fa6b70cb3f7233dc8d8d45a4f8ccb2c219773414..acdf05e415515f4f819766f731c6c064dd12b55a 100644
|
| --- a/chrome/renderer/localized_error.cc
|
| +++ b/chrome/renderer/localized_error.cc
|
| @@ -28,6 +28,10 @@ static const char kRedirectLoopLearnMoreUrl[] =
|
| "http://www.google.com/support/chrome/bin/answer.py?answer=95626";
|
| static const char kWeakDHKeyLearnMoreUrl[] =
|
| "http://sites.google.com/a/chromium.org/dev/err_ssl_weak_server_ephemeral_dh_key";
|
| +static const char kESETLearnMoreUrl[] =
|
| + "http://sites.google.com/a/chromium.org/dev/err_eset_anti_virus_ssl_interception";
|
| +static const char kNetNannyLearnMoreUrl[] =
|
| + "http://sites.google.com/a/chromium.org/dev/err_netnanny_ssl_interception";
|
|
|
| enum NAV_SUGGESTIONS {
|
| SUGGEST_NONE = 0,
|
| @@ -118,8 +122,8 @@ const LocalizedErrorMap net_error_options[] = {
|
| },
|
| {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
|
| IDS_ERRORPAGES_TITLE_LOAD_FAILED,
|
| - IDS_ERRORPAGES_HEADING_SSL_PROTOCOL_ERROR,
|
| - IDS_ERRORPAGES_SUMMARY_SSL_PROTOCOL_ERROR,
|
| + IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY,
|
| + IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY,
|
| IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
|
| SUGGEST_LEARNMORE,
|
| },
|
| @@ -130,6 +134,20 @@ const LocalizedErrorMap net_error_options[] = {
|
| IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED,
|
| SUGGEST_NONE,
|
| },
|
| + {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_NETNANNY_SSL_INTERCEPTION,
|
| + IDS_ERRORPAGES_TITLE_LOAD_FAILED,
|
| + IDS_ERRORPAGES_HEADING_NETNANNY_SSL_INTERCEPTION,
|
| + IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION,
|
| + IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
|
| + SUGGEST_LEARNMORE,
|
| + },
|
| };
|
|
|
| const LocalizedErrorMap http_error_options[] = {
|
| @@ -383,6 +401,12 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
|
| 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;
|
| + case net::ERR_NETNANNY_SSL_INTERCEPTION:
|
| + learn_more_url = GURL(kNetNannyLearnMoreUrl);
|
| + break;
|
| default:
|
| break;
|
| }
|
|
|