Material Page Info (Mac, 2/3): Update security section.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 21 matching lines @@
 #include "chrome/grit/theme_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
+#include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/flipped_view.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/resources/grit/ui_resources.h"
 
 using ChosenObjectInfoPtr =
     std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>;
 using ChosenObjectDeleteCallback =
     base::Callback<void(const WebsiteSettingsUI::ChosenObjectInfo&)>;
 
 namespace {
 
 /**************** General ****************/
 
 // The default width of the window, in view coordinates. It may be larger to
 // fit the content.
 const CGFloat kDefaultWindowWidth = 320;
 
 // Padding around each section
 const CGFloat kSectionVerticalPadding = 20;
 const CGFloat kSectionHorizontalPadding = 16;
 
-// Spacing between the identity field and the security summary.
-const CGFloat kSpacingBeforeSecuritySummary = 2;
+// Links are buttons with invisible padding, so we need to move them back to
+// align with other text.
+const CGFloat kLinkButtonXAdjustment = 1;
 
 /**************** Security Section ****************/
 
-// Spacing between the security summary and the reset decisions button.
-const CGFloat kSpacingBeforeResetDecisionsButton = 8;
+// Spacing between security summary, security details, and cert decisions text.
+const CGFloat kSecurityParagraphSpacing = 12;
 
 /**************** Site Settings Section ****************/
 
 // Spacing between parts of the site settings section.
 const CGFloat kSiteSettingsSectionSpacing = 2;
 
 // Square size of the permission images.
 const CGFloat kPermissionImageSize = 19;
 
 // Square size of the permission delete button image.
@@ skipping 231 matching lines @@
 // |superview|. |superview| retains the new view.
 - (NSView*)addSecuritySectionToView:(NSView*)superview {
   base::scoped_nsobject<NSView> securitySectionView(
       [[FlippedView alloc] initWithFrame:[superview frame]]);
   [superview addSubview:securitySectionView];
 
   // Create a controlOrigin to place the text fields. The y value doesn't
   // matter, because the correct value is calculated in -performLayout.
   NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
 
-  // Create a text field (empty for now) to show the site identity.
-  identityField_ = [self addText:base::string16()
-                        withSize:[NSFont systemFontSize]
-                            bold:YES
-                          toView:securitySectionView
-                         atPoint:controlOrigin];
-
   // Create a text field for the security summary (private/not private/etc.).
   securitySummaryField_ = [self addText:base::string16()
+                               withSize:[NSFont systemFontSize]
+                                   bold:NO
+                                 toView:securitySectionView
+                                atPoint:controlOrigin];
+
+  securityDetailsField_ = [self addText:base::string16()
                                withSize:[NSFont smallSystemFontSize]
                                    bold:NO
                                  toView:securitySectionView
                                 atPoint:controlOrigin];
 
-  resetDecisionsButton_ = nil;  // This will be created only if necessary.
+  // These will be created only if necessary.
+  resetDecisionsField_ = nil;
+  resetDecisionsButton_ = nil;
 
   NSString* securityDetailsButtonText =
       l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_DETAILS_LINK);
   // Note: The security details button may be removed from the superview in
   // -performLayout in order to hide it (depending on the connection).
   securityDetailsButton_ = [self addLinkButtonWithText:securityDetailsButtonText
                                                 toView:securitySectionView];
   [securityDetailsButton_ setTarget:self];
   [securityDetailsButton_ setAction:@selector(showSecurityDetails:)];
 
@@ skipping 126 matching lines @@
 
   [contentView_ setFrame:NSMakeRect(0, 0, NSWidth([contentView_ frame]), yPos)];
 
   [self sizeAndPositionWindow];
 }
 
 - (void)layoutSecuritySection {
   // Start the layout with the first element. Margins are handled by the caller.
   CGFloat yPos = 0;
 
-  [self sizeTextFieldHeightToFit:identityField_];
-  yPos = [self setYPositionOfView:identityField_
+  [self sizeTextFieldHeightToFit:securitySummaryField_];
+  yPos = [self setYPositionOfView:securitySummaryField_
                                to:yPos + kSectionVerticalPadding];
 
-  [self sizeTextFieldHeightToFit:securitySummaryField_];
-  yPos = [self setYPositionOfView:securitySummaryField_
-                               to:yPos + kSpacingBeforeSecuritySummary];
+  [self sizeTextFieldHeightToFit:securityDetailsField_];
+  yPos = [self setYPositionOfView:securityDetailsField_
+                               to:yPos + kSecurityParagraphSpacing];
 
   if (isDevToolsDisabled_ && !certificate_) {
     // -removeFromSuperview is idempotent.
     [securityDetailsButton_ removeFromSuperview];
   } else {
     // -addSubview is idempotent.
     [securitySectionView_ addSubview:securityDetailsButton_];
-    yPos = [self setYPositionOfView:securityDetailsButton_ to:yPos];
+    [securityDetailsButton_
+        setFrameOrigin:NSMakePoint(
+                           kSectionHorizontalPadding - kLinkButtonXAdjustment,
+                           yPos)];
+    yPos = NSMaxY([securityDetailsButton_ frame]);
   }
 
   if (resetDecisionsButton_) {
-    yPos = [self setYPositionOfView:resetDecisionsButton_
-                                 to:yPos + kSpacingBeforeResetDecisionsButton];
+    DCHECK(resetDecisionsField_);
+    yPos = [self setYPositionOfView:resetDecisionsField_
+                                 to:yPos + kSecurityParagraphSpacing];
+    [resetDecisionsButton_
+        setFrameOrigin:NSMakePoint(NSMinX([resetDecisionsButton_ frame]) -
+                                       kLinkButtonXAdjustment,
+                                   yPos)];
+    yPos = NSMaxY([resetDecisionsButton_ frame]);
   }
 
   // Resize the height based on contents.
   [self setHeightOfView:securitySectionView_ to:yPos + kSectionVerticalPadding];
 }
 
 - (void)layoutSiteSettingsSection {
   // Start the layout with the first element. Margins are handled by the caller.
   CGFloat yPos = 0;
 
@@ skipping 151 matching lines @@
   [button setFrame:buttonFrame];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
   [view addSubview:button.get()];
 
   return button.get();
 }
 
 // Set the content of the identity and identity status fields.
 - (void)setIdentityInfo:(const WebsiteSettingsUI::IdentityInfo&)identityInfo {
-  [identityField_
-      setStringValue:base::SysUTF8ToNSString(identityInfo.site_identity)];
-  [securitySummaryField_ setStringValue:base::SysUTF16ToNSString(
-                                            identityInfo.GetSecuritySummary())];
+  std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description =
+      identityInfo.GetSecurityDescription();
+  [securitySummaryField_
+      setStringValue:base::SysUTF16ToNSString(security_description->summary)];
+
+  [securityDetailsField_
+      setStringValue:SysUTF16ToNSString(security_description->details)];
 
   certificate_ = identityInfo.certificate;
 
   if (certificate_ &&  identityInfo.show_ssl_decision_revoke_button) {
-    NSString* text = l10n_util::GetNSString(
-        IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON);
+    resetDecisionsField_ =
+        [self addText:base::string16()
+             withSize:[NSFont smallSystemFontSize]
+                 bold:NO
+               toView:securitySectionView_
+              atPoint:NSMakePoint(kSectionHorizontalPadding, 0)];
+    [resetDecisionsField_
+        setStringValue:l10n_util::GetNSString(
+                           IDS_PAGEINFO_INVALID_CERTIFICATE_DESCRIPTION)];
+    [self sizeTextFieldHeightToFit:resetDecisionsField_];
+
     resetDecisionsButton_ =
-        [self addButtonWithText:text toView:securitySectionView_];
+        [self addLinkButtonWithText:
+                  l10n_util::GetNSString(
+                      IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON)
+                             toView:securitySectionView_];
     [resetDecisionsButton_ setTarget:self];
     [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
   }
 
   [self performLayout];
 }
 
 // Add a pop-up button for |permissionInfo| to the given view.
 - (NSPopUpButton*)addPopUpButtonForPermission:
     (const WebsiteSettingsUI::PermissionInfo&)permissionInfo
@@ skipping 506 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }