Page Info permissions: make font sizes and spacing more consistent.

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>
 
@@ skipping 75 matching lines @@
 
 // Minimum distance between the label and its corresponding menu.
 const CGFloat kMinSeparationBetweenLabelAndMenu = 16;
 
 // Square size of the permission delete button image.
 const CGFloat kPermissionDeleteImageSize = 16;
 
 // The spacing between individual permissions.
 const CGFloat kPermissionsVerticalSpacing = 16;
 
-// The spacing between permissions and their decision description labels.
-const CGFloat kPermissionsDecisionVerticalSpacing = 4;
+// Spacing to add after a permission label, either directly on top of
+// kPermissionsVerticalSpacing, or before additional text (e.g. "X in use" for
+// cookies).
+const CGFloat kPermissionLabelBottomPadding = 4;
 
 // Amount to lower each permission icon to align the icon baseline with the
 // label text.
 const CGFloat kPermissionIconYAdjustment = 1;
 
 // Amount to lower each permission popup button to make its text align with the
 // permission label.
 const CGFloat kPermissionPopupButtonYAdjustment = 3;
 
 // Internal Page Bubble --------------------------------------------------------
@@ skipping 789 matching lines @@
   [self alignPermissionIcon:imageView withTextField:label];
 
   // Permissions specified by policy or an extension cannot be changed.
   if (permissionInfo.source == content_settings::SETTING_SOURCE_EXTENSION ||
       permissionInfo.source == content_settings::SETTING_SOURCE_POLICY) {
     [button setEnabled:NO];
   }
 
   // Update |point| to match the y of the bottomost UI element added (|button|).
   NSRect buttonFrame = [button frame];
-  point.y = NSMaxY(buttonFrame);
+  point.y = NSMaxY(labelFrame) + kPermissionLabelBottomPadding;
 
   // Show the reason for the permission decision in a new row if it did not come
   // from the user.
   base::string16 reason = PageInfoUI::PermissionDecisionReasonToUIString(
       [self profile], permissionInfo, url_);
   if (!reason.empty()) {
-    point.y += kPermissionsDecisionVerticalSpacing;
     label = [self addText:reason
-                 withSize:[NSFont systemFontSize]
+                 withSize:[NSFont smallSystemFontSize]
                      bold:NO
                    toView:view
                   atPoint:point];
     label.textColor = skia::SkColorToSRGBNSColor(
         PageInfoUI::GetPermissionDecisionTextColor());
     point.y += NSHeight(label.frame);
   }
 
   return NSMakePoint(NSMaxX(buttonFrame), point.y);
 }
@@ skipping 142 matching lines @@
               atPoint:controlOrigin];
     [cookiesLabel sizeToFit];
 
     NSPoint cookiesLabelOrigin = [cookiesLabel frame].origin;
     cookiesLabelOrigin.x -= NSWidth([cookiesLabel frame]);
     [cookiesLabel setFrameOrigin:cookiesLabelOrigin];
 
     // Align the icon with the text.
     [self alignPermissionIcon:imageView withTextField:cookiesLabel];
 
-    controlOrigin.y += NSHeight([cookiesLabel frame]);
+    controlOrigin.y +=
+        NSHeight([cookiesLabel frame]) + kPermissionLabelBottomPadding;
     controlOrigin.x -= NSWidth([cookiesButton frame]) - kLinkButtonXAdjustment;
     [cookiesButton setFrameOrigin:controlOrigin];
   } else {
     controlOrigin.x += kPermissionImageSize + kPermissionImageSpacing;
     NSTextField* cookiesLabel =
         [self addText:l10n_util::GetStringUTF16(IDS_PAGE_INFO_COOKIES)
              withSize:[NSFont systemFontSize]
                  bold:NO
                toView:cookiesView_
               atPoint:controlOrigin];
     [cookiesLabel sizeToFit];
 
-    controlOrigin.y += NSHeight([cookiesLabel frame]);
+    controlOrigin.y +=
+        NSHeight([cookiesLabel frame]) + kPermissionLabelBottomPadding;
     controlOrigin.x -= kLinkButtonXAdjustment;
     [cookiesButton setFrameOrigin:controlOrigin];
 
     // Align the icon with the text.
     [self alignPermissionIcon:imageView withTextField:cookiesLabel];
   }
 
   controlOrigin.y += NSHeight([cookiesButton frame]);
   [cookiesView_
       setFrameSize:NSMakeSize(NSWidth([cookiesView_ frame]), controlOrigin.y)];
@@ skipping 113 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)];
 }