Convert OSX Page Info Bubble to Material Design

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 100 matching lines @@
      IDR_ALLOWED_DOWNLOADS},
     {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX,
      IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX},
     {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
      IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},
     {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
      IDS_WEBSITE_SETTINGS_TYPE_BACKGROUND_SYNC, IDR_BLOCKED_BACKGROUND_SYNC,
      IDR_ALLOWED_BACKGROUND_SYNC},
 };
 
+std::unique_ptr<WebsiteSettingsUI::SecurityDescription>
+CreateSecurityDescription(int summary_id,
+                          WebsiteSettingsUI::SecuritySummaryStyle summary_style,
+                          int details_id) {
+  std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description(
+      new WebsiteSettingsUI::SecurityDescription());
+  security_description->summary = l10n_util::GetStringUTF16(summary_id);
+  security_description->summary_style = summary_style;

[felt, 2016/06/30 05:39:24]

I'm a little confused, where is the summary_style read/used?

[lgarron, 2016/07/08 17:47:08]

In the OS-specific code (website_settings_bubble_controller.mm >
setIdentityInfo:).

+  security_description->details = l10n_util::GetStringUTF16(details_id);
+  return security_description;
+}
 }  // namespace
 
 WebsiteSettingsUI::CookieInfo::CookieInfo()
     : allowed(-1), blocked(-1) {
 }
 
 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
     : type(CONTENT_SETTINGS_TYPE_DEFAULT),
       setting(CONTENT_SETTING_DEFAULT),
       default_setting(CONTENT_SETTING_DEFAULT),
       source(content_settings::SETTING_SOURCE_NONE),
       is_incognito(false) {}
 
 WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo(
     const WebsiteSettings::ChooserUIInfo& ui_info,
     std::unique_ptr<base::DictionaryValue> object)
     : ui_info(ui_info), object(std::move(object)) {}
 
 WebsiteSettingsUI::ChosenObjectInfo::~ChosenObjectInfo() {}
 
 WebsiteSettingsUI::IdentityInfo::IdentityInfo()
     : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN),
       cert_id(0),
       connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN),
       show_ssl_decision_revoke_button(false) {
 }
 
 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {}
 
-base::string16 WebsiteSettingsUI::IdentityInfo::GetSecuritySummary() const {
+std::unique_ptr<WebsiteSettingsUI::SecurityDescription>
+WebsiteSettingsUI::IdentityInfo::GetSecurityDescription() const {
+  std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description(
+      new WebsiteSettingsUI::SecurityDescription());
+
   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:
-          return l10n_util::GetStringUTF16(
-              IDS_WEBSITE_SETTINGS_MIXED_PASSIVE_CONTENT);
+          return CreateSecurityDescription(
+              IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY, STYLE_YELLOW,
+              IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
         case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT:
-          return l10n_util::GetStringUTF16(
-              IDS_WEBSITE_SETTINGS_MIXED_ACTIVE_CONTENT);
+          return CreateSecurityDescription(
+              IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY, STYLE_RED,
+              IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
         default:
-          return l10n_util::GetStringUTF16(
-              IDS_WEBSITE_SETTINGS_SECURE_TRANSPORT);
+          return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_SECURE_SUMMARY,
+                                           STYLE_GREEN,
+                                           IDS_WEBSITE_SETTINGS_SECURE_DETAILS);
       }
     case WebsiteSettings::
         SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR:
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,
+                                       STYLE_YELLOW,
+                                       IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
     case WebsiteSettings::
         SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR:
-      return l10n_util::GetStringUTF16(
-          IDS_WEBSITE_DEPRECATED_SIGNATURE_ALGORITHM);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,

[felt, 2016/06/30 05:39:24]

Since some of these now share strings and styles, could those be collapsed into
one case, like:

Case A:
Case B:
Case C:
  return Foo();

It looks to me like SITE_IDENTITY_STATUS_UNKNOWN,
SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT, and
SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR could be combined for
example.

[lgarron, 2016/07/08 17:47:08]

I was planning to collapse these once the strings are final. I've condensed them
in the latest patch based on the current draft strings.

+                                       STYLE_RED,
+                                       IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
     case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
-      return l10n_util::GetStringUTF16(IDS_CERT_POLICY_PROVIDED_CERT_HEADER);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,
+                                       STYLE_RED,
+                                       IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
     case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN:
-      return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_UNKNOWN_TRANSPORT);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,
+                                       STYLE_RED,
+                                       IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
     case WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR:
-      return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_CT_ERROR);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_SECURE_SUMMARY,
+                                       STYLE_RED,
+                                       IDS_WEBSITE_SETTINGS_SECURE_DETAILS);
     case WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE:
-      return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INTERNAL_PAGE);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_INTERNAL_PAGE,
+                                       STYLE_DEFAULT,
+                                       IDS_WEBSITE_SETTINGS_INTERNAL_PAGE);
     case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
     default:
-      return l10n_util::GetStringUTF16(
-          IDS_WEBSITE_SETTINGS_NON_SECURE_TRANSPORT);
+      return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,
+                                       STYLE_RED,
+                                       IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
   }
 }
 
+base::string16 WebsiteSettingsUI::IdentityInfo::GetSecuritySummary() const {
+  std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description =
+      GetSecurityDescription();
+  return security_description->summary;
+}
+
 WebsiteSettingsUI::~WebsiteSettingsUI() {
 }
 
 // static
 base::string16 WebsiteSettingsUI::PermissionTypeToUIString(
       ContentSettingsType type) {
   for (const PermissionsUIInfo& info : kPermissionsUIInfo) {
     if (info.type == type)
       return l10n_util::GetStringUTF16(info.string_id);
   }
@@ skipping 168 matching lines @@
   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }