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

Unified Diff: components/error_page/common/localized_error.cc

Issue 2008043005: Fix incorrect learn more string for ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix standalone_suggestion logic Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/error_page/common/localized_error.cc
diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc
index 2005e493ad0ba094cea8bb7bdf79e0aacb3b914a..4b807d8218159fee771dffa24085f047a3701d9f 100644
--- a/components/error_page/common/localized_error.cc
+++ b/components/error_page/common/localized_error.cc
@@ -623,15 +623,13 @@ void AddLinkedSuggestionToList(const int error_code,
bool standalone_suggestion) {
GURL learn_more_url;
base::string16 suggestion_string = standalone_suggestion ?
- l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY) :
l10n_util::GetStringUTF16(
- IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY_STANDALONE);
+ IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY_STANDALONE) :
+ l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY);
switch (error_code) {
case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
learn_more_url = GURL(kWeakDHKeyLearnMoreUrl);
- suggestion_string = l10n_util::GetStringUTF16(
- IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY);
break;
case net::ERR_TOO_MANY_REDIRECTS:
learn_more_url = GURL(kRedirectLoopLearnMoreUrl);
@@ -725,12 +723,12 @@ void GetSuggestionsSummaryList(int error_code,
if (IsOnlySuggestion(suggestions, SUGGEST_LEARNMORE)) {
DCHECK(suggestions_summary_list->empty());
AddLinkedSuggestionToList(error_code, locale, suggestions_summary_list,
- false);
+ true);
return;
}
if (IsSuggested(suggestions, SUGGEST_LEARNMORE)) {
AddLinkedSuggestionToList(error_code, locale, suggestions_summary_list,
- true);
+ false);
}
if (suggestions & SUGGEST_DISABLE_EXTENSION) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698