Adjust WebsiteSettings statuses for subresources with cert errors

chrome/browser/ui/website_settings/website_settings_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 
 #include "base/macros.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/plugins_field_trial.h"
@@ skipping 133 matching lines @@
 }
 
 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {}
 
 base::string16 WebsiteSettingsUI::IdentityInfo::GetSecuritySummary() const {
   switch (identity_status) {
     case WebsiteSettings::SITE_IDENTITY_STATUS_CERT:
     case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT:
     case WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN:
       switch (connection_status) {
-        case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
+        case WebsiteSettings::
+            SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE:
           return l10n_util::GetStringUTF16(
-              IDS_WEBSITE_SETTINGS_MIXED_PASSIVE_CONTENT);
-        case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT:
+              IDS_WEBSITE_SETTINGS_INSECURE_PASSIVE_CONTENT);
+        case WebsiteSettings::
+            SITE_CONNECTION_STATUS_INSECURE_ACTIVE_SUBRESOURCE:
           return l10n_util::GetStringUTF16(
-              IDS_WEBSITE_SETTINGS_MIXED_ACTIVE_CONTENT);
+              IDS_WEBSITE_SETTINGS_INSECURE_ACTIVE_CONTENT);
         default:
           return l10n_util::GetStringUTF16(
               IDS_WEBSITE_SETTINGS_SECURE_TRANSPORT);
       }
     case WebsiteSettings::
         SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR:
     case WebsiteSettings::
         SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR:
       return l10n_util::GetStringUTF16(
           IDS_WEBSITE_DEPRECATED_SIGNATURE_ALGORITHM);
@@ skipping 173 matching lines @@
 int WebsiteSettingsUI::GetConnectionIconID(
     WebsiteSettings::SiteConnectionStatus status) {
   int resource_id = IDR_PAGEINFO_INFO;
   switch (status) {
     case WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN:
     case WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE:
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED:
       resource_id = IDR_PAGEINFO_GOOD;
       break;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
+    case WebsiteSettings::SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE:
       resource_id = IDR_PAGEINFO_WARNING_MINOR;
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED:
       resource_id = IDR_PAGEINFO_WARNING_MAJOR;
       break;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT:
+    case WebsiteSettings::SITE_CONNECTION_STATUS_INSECURE_ACTIVE_SUBRESOURCE:
     case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR:
       resource_id = IDR_PAGEINFO_BAD;
       break;
   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }