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

Unified Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 1102063002: Remove the SHA-1 deprecation field trial code; the plan is live (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reformated Created 5 years, 8 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/browser/ui/toolbar/toolbar_model_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 297b4be9f8514626414f9371dfe3c4c692210ea3..ea26719ce5696b7a2f2570c7ba1256490be16b70 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -512,11 +512,7 @@ void WebsiteSettings::Init(Profile* profile,
static const int64_t kSHA1LastIssuanceDate = INT64_C(13096080000000000);
if ((ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) &&
cert->valid_expiry() >
- base::Time::FromInternalValue(kSHA1LastIssuanceDate) &&
- // NOTE: This use of SHA1IdentityUIWarning needs to be kept in sync
- // with ToolbarModelImpl::IsDeprecatedSHA1Present().
- base::FieldTrialList::FindFullName("SHA1IdentityUIWarning") ==
- "Enabled") {
+ base::Time::FromInternalValue(kSHA1LastIssuanceDate)) {
site_identity_status_ =
SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM;
site_identity_details_ +=
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698