Add a Certificate Viewer link to the Page Info dropdown

chrome/browser/ui/cocoa/page_info/page_info_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/page_info/page_info_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
+#include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/page_info/permission_selector_button.h"
 #include "chrome/browser/ui/page_info/permission_menu_model.h"
 #import "chrome/browser/ui/tab_dialogs.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.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/web_contents.h"
 #include "content/public/common/url_constants.h"
@@ skipping 302 matching lines @@
 
   securityDetailsField_ = [self addText:base::string16()
                                withSize:[NSFont smallSystemFontSize]
                                    bold:NO
                                  toView:securitySectionView
                                 atPoint:controlOrigin];
 
   // These will be created only if necessary.
   resetDecisionsField_ = nil;
   resetDecisionsButton_ = nil;
+  certificateView_ = nil;
 
   NSString* connectionHelpButtonText = l10n_util::GetNSString(IDS_LEARN_MORE);
   connectionHelpButton_ = [self addLinkButtonWithText:connectionHelpButtonText
                                                toView:securitySectionView];
   [connectionHelpButton_ setTarget:self];
   [connectionHelpButton_ setAction:@selector(openConnectionHelp:)];
 
   return securitySectionView.get();
 }
 
@@ skipping 162 matching lines @@
   }
 
   // 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;
 
+  if (certificateView_) {
+    yPos = [self setYPositionOfView:certificateView_
+                                 to:yPos + kSectionVerticalPadding];
+  }
+
   yPos =
       [self setYPositionOfView:cookiesView_ to:yPos + kSectionVerticalPadding];
 
   if (permissionsPresent_) {
     // Put the permission info just below the link button.
     yPos = [self setYPositionOfView:permissionsView_ to:yPos];
   }
 
   yPos = [self layoutViewAtRTLStart:siteSettingsButton_ withYPosition:yPos];
 
@@ skipping 134 matching lines @@
   buttonFrame.size.width = maxTitleWidth;
 
   [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.
+// Set the content of the identity and identity status fields, and add the
+// Certificate view if applicable.
 - (void)setIdentityInfo:(const PageInfoUI::IdentityInfo&)identityInfo {
   std::unique_ptr<PageInfoUI::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) {
-    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_];
+  if (certificate_) {
+    if (identityInfo.show_ssl_decision_revoke_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 addLinkButtonWithText:
-                  l10n_util::GetNSString(
-                      IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON)
-                             toView:securitySectionView_];
-    [resetDecisionsButton_ setTarget:self];
-    [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
-  }
+      resetDecisionsButton_ =
+          [self addLinkButtonWithText:
+                    l10n_util::GetNSString(
+                        IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON)
+                               toView:securitySectionView_];
+      [resetDecisionsButton_ setTarget:self];
+      [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
+    }
+
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[lgarron, 2017/04/05 02:06:26]

Could you move this check into a platform-independent helper in page_info_ui.h?

Similar to GetPermissionDecisionTextColor() in
https://codereview.chromium.org/2743423004; I want to unify cross-platform
calculations as much as possible:
https://docs.google.com/document/d/12YnhxsNd-o82DfsyPpHRKM2yuXx7XOoKqaPt94CL9...

+            switches::kShowCertButton)) {
+      if (!certificateView_) {
+        certificateView_ = [[[FlippedView alloc]
+            initWithFrame:[contentView_ frame]] autorelease];
+        [certificateView_ setAutoresizingMask:NSViewWidthSizable];
+        [siteSettingsSectionView_ addSubview:certificateView_];
+      }
+
+      base::string16 label_text = l10n_util::GetStringUTF16(
+          (identityInfo.identity_status == PageInfo::SITE_IDENTITY_STATUS_ERROR)
+              ? IDS_PAGE_INFO_CERTIFICATE_INVALID_LINK
+              : IDS_PAGE_INFO_CERTIFICATE_VALID_LINK);
+
+      base::string16 sectionTitle =
+          l10n_util::GetStringUTF16(IDS_PAGE_INFO_CERTIFICATE);
+      bool isRTL = base::i18n::IsRTL();
+
+      [certificateView_ setSubviews:[NSArray array]];
+      NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
+
+      CGFloat viewWidth = NSWidth([certificateView_ frame]);
+
+      // Reset X for the certificate image.
+      if (isRTL) {
+        controlOrigin.x = viewWidth - kPermissionImageSize -
+                          kPermissionImageSpacing - kSectionHorizontalPadding;
+      }
+
+      NSImage* image = PageInfoUI::GetCertificateIcon().ToNSImage();
+      NSImageView* imageView = [self addImageWithSize:[image size]
+                                               toView:certificateView_
+                                              atPoint:controlOrigin];
+      [imageView setImage:image];
+
+      NSButton* certificateButton =
+          [self addLinkButtonWithText:base::SysUTF16ToNSString(label_text)
+                               toView:certificateView_];
+      [certificateButton setTarget:self];
+      [certificateButton setAction:@selector(showCertificateInfo:)];
+
+      if (isRTL) {
+        controlOrigin.x -= kPermissionImageSpacing;
+        NSTextField* certificateLabel = [self addText:sectionTitle
+                                             withSize:[NSFont systemFontSize]
+                                                 bold:NO
+                                               toView:certificateView_
+                                              atPoint:controlOrigin];
+        [certificateLabel sizeToFit];
+
+        NSPoint certificateLabelOrigin = [certificateLabel frame].origin;
+        certificateLabelOrigin.x -= NSWidth([certificateLabel frame]);
+        [certificateLabel setFrameOrigin:certificateLabelOrigin];
+
+        // Align the icon with the text.
+        [self alignPermissionIcon:imageView withTextField:certificateLabel];
+
+        controlOrigin.y += NSHeight([certificateLabel frame]);
+        controlOrigin.x -=
+            NSWidth([certificateButton frame]) - kLinkButtonXAdjustment;
+        [certificateButton setFrameOrigin:controlOrigin];
+      } else {
+        controlOrigin.x += kPermissionImageSize + kPermissionImageSpacing;
+        NSTextField* certificateLabel = [self addText:sectionTitle
+                                             withSize:[NSFont systemFontSize]
+                                                 bold:NO
+                                               toView:certificateView_
+                                              atPoint:controlOrigin];
+        [certificateLabel sizeToFit];
+
+        controlOrigin.y += NSHeight([certificateLabel frame]);
+        controlOrigin.x -= kLinkButtonXAdjustment;
+        [certificateButton setFrameOrigin:controlOrigin];
+
+        // Align the icon with the text.
+        [self alignPermissionIcon:imageView withTextField:certificateLabel];
+      }
+
+      controlOrigin.y += NSHeight([certificateButton frame]);
+      [certificateView_
+          setFrameSize:NSMakeSize(NSWidth([certificateView_ frame]),
+                                  controlOrigin.y)];
+    }
+  }  // if (certificate_)
 
   [self performLayout];
 }
 
 // Add a pop-up button for |permissionInfo| to the given view.
 - (NSPopUpButton*)addPopUpButtonForPermission:
                       (const PageInfoUI::PermissionInfo&)permissionInfo
                                        toView:(NSView*)view
                                       atPoint:(NSPoint)point {
   GURL url = webContents_ ? webContents_->GetURL() : GURL();
@@ skipping 272 matching lines @@
   // cookies.
   DCHECK_EQ(cookieInfoList.size(), 2u);
 
   int totalAllowed = 0;
   for (const auto& i : cookieInfoList) {
     totalAllowed += i.allowed;
   }
   base::string16 label_text =
       l10n_util::GetPluralStringFUTF16(IDS_PAGE_INFO_NUM_COOKIES, totalAllowed);
 
-  base::string16 sectionTitle =
-      l10n_util::GetStringUTF16(IDS_PAGE_INFO_TITLE_SITE_DATA);
   bool isRTL = base::i18n::IsRTL();
 
   [cookiesView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
 
   CGFloat viewWidth = NSWidth([cookiesView_ frame]);
 
   // Reset X for the cookie image.
   if (isRTL) {
     controlOrigin.x = viewWidth - kPermissionImageSize -
@@ skipping 63 matching lines @@
 }
 
 - (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList
          andChosenObjects:(ChosenObjectInfoList)chosenObjectInfoList {
   [permissionsView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
 
   permissionsPresent_ = YES;
 
   if (permissionInfoList.size() > 0 || chosenObjectInfoList.size() > 0) {
-    base::string16 sectionTitle =
-        l10n_util::GetStringUTF16(IDS_PAGE_INFO_TITLE_SITE_PERMISSIONS);
-
     for (const auto& permission : permissionInfoList) {
       controlOrigin.y += kPermissionsVerticalSpacing;
       NSPoint rowBottomRight = [self addPermission:permission
                                             toView:permissionsView_
                                            atPoint:controlOrigin];
       controlOrigin.y = rowBottomRight.y;
     }
 
     for (auto& object : chosenObjectInfoList) {
       controlOrigin.y += kPermissionsVerticalSpacing;
@@ skipping 88 matching lines @@
 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) {
   [bubble_controller_ setCookieInfo:cookie_info_list];
 }
 
 void PageInfoUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }