| 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 c717aac581046759c00b881708a21035c286dfc2..f0d9d775f0ed095d133066ab9f8906fe51a1a482 100644
|
| --- a/chrome/browser/ui/website_settings/website_settings.cc
|
| +++ b/chrome/browser/ui/website_settings/website_settings.cc
|
| @@ -165,7 +165,7 @@ WebsiteSettings::WebsiteSettings(
|
| TabSpecificContentSettings* tab_specific_content_settings,
|
| content::WebContents* web_contents,
|
| const GURL& url,
|
| - const SecurityStateModel::SecurityInfo& security_info,
|
| + const security_state::SecurityStateModel::SecurityInfo& security_info,
|
| content::CertStore* cert_store)
|
| : TabSpecificContentSettings::SiteDataObserver(
|
| tab_specific_content_settings),
|
| @@ -312,7 +312,7 @@ void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() {
|
|
|
| void WebsiteSettings::Init(
|
| const GURL& url,
|
| - const SecurityStateModel::SecurityInfo& security_info) {
|
| + const security_state::SecurityStateModel::SecurityInfo& security_info) {
|
| bool isChromeUINativeScheme = false;
|
| #if BUILDFLAG(ANDROID_JAVA_UI)
|
| isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
|
| @@ -350,7 +350,7 @@ void WebsiteSettings::Init(
|
| net::IsCertStatusMinorError(security_info.cert_status))) {
|
| // There are no major errors. Check for minor errors.
|
| if (security_info.security_level ==
|
| - SecurityStateModel::SECURITY_POLICY_WARNING) {
|
| + security_state::SecurityStateModel::SECURITY_POLICY_WARNING) {
|
| site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT;
|
| site_identity_details_ = l10n_util::GetStringFUTF16(
|
| IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(url.host()));
|
| @@ -426,7 +426,7 @@ void WebsiteSettings::Init(
|
| issuer_name));
|
| }
|
| switch (security_info.sha1_deprecation_status) {
|
| - case SecurityStateModel::DEPRECATED_SHA1_MINOR:
|
| + case security_state::SecurityStateModel::DEPRECATED_SHA1_MINOR:
|
| site_identity_status_ =
|
| SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR;
|
| site_identity_details_ +=
|
| @@ -434,7 +434,7 @@ void WebsiteSettings::Init(
|
| l10n_util::GetStringUTF16(
|
| IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MINOR);
|
| break;
|
| - case SecurityStateModel::DEPRECATED_SHA1_MAJOR:
|
| + case security_state::SecurityStateModel::DEPRECATED_SHA1_MAJOR:
|
| site_identity_status_ =
|
| SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR;
|
| site_identity_details_ +=
|
| @@ -442,7 +442,7 @@ void WebsiteSettings::Init(
|
| l10n_util::GetStringUTF16(
|
| IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR);
|
| break;
|
| - case SecurityStateModel::NO_DEPRECATED_SHA1:
|
| + case security_state::SecurityStateModel::NO_DEPRECATED_SHA1:
|
| // Nothing to do.
|
| break;
|
| }
|
| @@ -496,7 +496,8 @@ void WebsiteSettings::Init(
|
| // Security strength is unknown. Say nothing.
|
| site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
|
| } else if (security_info.security_bits == 0) {
|
| - DCHECK_NE(security_info.security_level, SecurityStateModel::NONE);
|
| + DCHECK_NE(security_info.security_level,
|
| + security_state::SecurityStateModel::NONE);
|
| site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
|
| site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
|
| @@ -515,12 +516,13 @@ void WebsiteSettings::Init(
|
| }
|
|
|
| if (security_info.mixed_content_status !=
|
| - SecurityStateModel::NO_MIXED_CONTENT) {
|
| + security_state::SecurityStateModel::NO_MIXED_CONTENT) {
|
| bool ran_insecure_content =
|
| (security_info.mixed_content_status ==
|
| - SecurityStateModel::RAN_MIXED_CONTENT ||
|
| + security_state::SecurityStateModel::RAN_MIXED_CONTENT ||
|
| security_info.mixed_content_status ==
|
| - SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT);
|
| + security_state::SecurityStateModel::
|
| + RAN_AND_DISPLAYED_MIXED_CONTENT);
|
| site_connection_status_ = ran_insecure_content
|
| ? SITE_CONNECTION_STATUS_MIXED_SCRIPT
|
| : SITE_CONNECTION_STATUS_MIXED_CONTENT;
|
|
|