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

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

Issue 2616553002: Remove obsolete SHA-1 UX elements (Closed)
Patch Set: Fixup WebsiteSettingsTest Created 3 years, 11 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/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 c9dae32d9c4bf20c068e3461332cc62e0b5aba7c..ef0636f74275ea910a577435d55fd03c39a28e36 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -493,21 +493,13 @@ void WebsiteSettings::Init(const GURL& url,
IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_VERIFIED, issuer_name));
}
switch (security_info.sha1_deprecation_status) {
- case security_state::DEPRECATED_SHA1_MINOR:
+ case security_state::DEPRECATED_SHA1:
site_identity_status_ =
- SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR;
+ SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM;
site_identity_details_ +=
UTF8ToUTF16("\n\n") +
l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MINOR);
- break;
- case security_state::DEPRECATED_SHA1_MAJOR:
- site_identity_status_ =
- SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR;
- site_identity_details_ +=
- UTF8ToUTF16("\n\n") +
- l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR);
+ IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM);
break;
case security_state::NO_DEPRECATED_SHA1:
// Nothing to do.
@@ -683,9 +675,7 @@ void WebsiteSettings::Init(const GURL& url,
site_identity_status_ == SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN ||
site_identity_status_ == SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT ||
site_identity_status_ ==
- SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR ||
- site_identity_status_ ==
- SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR) {
+ SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM) {
tab_id = WebsiteSettingsUI::TAB_ID_CONNECTION;
RecordWebsiteSettingsAction(
WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY);

Powered by Google App Engine
This is Rietveld 408576698