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

Unified Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 336273002: Suggest upgrading to SP3 or later for invalid certificate errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed complilation errors Created 6 years, 5 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
Index: chrome/browser/ssl/ssl_blocking_page.cc
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index ca97c2b60a0a90009235bd3716fc0b3b657f2126..f3a934807c3316db0485841914317645390320cd 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -50,10 +50,6 @@
#include "chrome/browser/captive_portal/captive_portal_service_factory.h"
#endif
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
using base::ASCIIToUTF16;
using base::TimeTicks;
using content::InterstitialPage;
@@ -511,7 +507,6 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
load_time_data.SetString(
"closeDetails",
l10n_util::GetStringUTF16(IDS_SSL_V2_CLOSE_DETAILS_BUTTON));
-
if (overridable_ && !strict_enforcement_) { // Overridable.
SSLErrorInfo error_info =
SSLErrorInfo::CreateError(
@@ -528,17 +523,25 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, url));
} else { // Non-overridable.
load_time_data.SetBoolean("overridable", false);
- load_time_data.SetString(
- "explanationParagraph",
- l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url));
+ SSLErrorInfo::ErrorType type = SSLErrorInfo::CERT_INVALID;
+ // SSLErrorInfo::NetErrorToErrorType(cert_error_);
+ if (type == SSLErrorInfo::CERT_INVALID && SSLErrorClassification::
+ IsWindowsVersionSP3OrLower()) {
+ load_time_data.SetString(
+ "explanationParagraph",
+ l10n_util::GetStringFUTF16(
+ IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3, url));
+ } else {
+ load_time_data.SetString("explanationParagraph",
+ l10n_util::GetStringFUTF16(
+ IDS_SSL_NONOVERRIDABLE_MORE, url));
+ }
load_time_data.SetString(
"primaryButtonText",
l10n_util::GetStringUTF16(IDS_SSL_NONOVERRIDABLE_RELOAD_BUTTON));
// Customize the help link depending on the specific error type.
// Only mark as HSTS if none of the more specific error types apply, and use
// INVALID as a fallback if no other string is appropriate.
- SSLErrorInfo::ErrorType type =
- SSLErrorInfo::NetErrorToErrorType(cert_error_);
load_time_data.SetInteger("errorType", type);
int help_string = IDS_SSL_NONOVERRIDABLE_INVALID;
switch (type) {

Powered by Google App Engine
This is Rietveld 408576698