Material page info (Mac, 1/3): Update section padding variables.

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 40 matching lines @@
 #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 = 310;
+const CGFloat kDefaultWindowWidth = 320;
 
-// Padding between the window frame and content.
-const CGFloat kFramePadding = 20;
-
-// Padding between the window frame and content.
-const CGFloat kVerticalSectionMargin = 16;
-
-// Padding between the window frame and content for the internal page bubble.
-const CGFloat kInternalPageFramePadding = 10;
+// 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;
 
+/**************** Security Section ****************/
+
 // Spacing between the security summary and the reset decisions button.
 const CGFloat kSpacingBeforeResetDecisionsButton = 8;
 
+/**************** Site Settings Section ****************/
+
 // Spacing between parts of the site settings section.
 const CGFloat kSiteSettingsSectionSpacing = 2;
 
-// Spacing between the image and text for internal pages.
-const CGFloat kInternalPageImageSpacing = 10;
-
 // Square size of the permission images.
 const CGFloat kPermissionImageSize = 19;
 
 // Square size of the permission delete button image.
 const CGFloat kPermissionDeleteImageSize = 16;
 
 // Vertical adjustment for the permission images. They have an extra pixel of
 // padding on the bottom edge.
 const CGFloat kPermissionImageYAdjust = 1;
 
 // Spacing between a permission image and the text.
 const CGFloat kPermissionImageSpacing = 3;
 
 // The spacing between individual items in the Permissions tab.
 const CGFloat kPermissionsTabSpacing = 12;
 
 // Extra spacing after a headline on the Permissions tab.
 const CGFloat kPermissionsHeadlineSpacing = 2;
 
 // The amount of horizontal space between a permission label and the popup.
 const CGFloat kPermissionPopUpXSpacing = 3;
 
 // The amount of padding to *remove* when placing
 // |IDS_WEBSITE_SETTINGS_{FIRST,THIRD}_PARTY_SITE_DATA| next to each other.
 const CGFloat kTextLabelXPadding = 5;
 
+/**************** Internal Page Bubble ****************/
+
+// Padding between the window frame and content for the internal page bubble.
+const CGFloat kInternalPageFramePadding = 10;
+
+// Spacing between the image and text for internal pages.
+const CGFloat kInternalPageImageSpacing = 10;
+
+/********************************/
+
 // NOTE: This assumes that there will never be more than one website settings
 // popup shown, and that the one that is shown is associated with the current
 // window. This matches the behaviour in views: see WebsiteSettingsPopupView.
 bool g_is_popup_showing = false;
 
 // Takes in the parent window, which should be a BrowserWindow, and gets the
 // proper anchor point for the bubble. The returned point is in screen
 // coordinates.
 NSPoint AnchorPointForWindow(NSWindow* parent) {
   BrowserWindowController* controller = [parent windowController];
@@ skipping 187 matching lines @@
 
 // Create and return a subview for the security section and add it to the given
 // |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(kFramePadding, 0);
+  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()
@@ skipping 122 matching lines @@
   // Make the content at least as wide as the permissions view.
   CGFloat contentWidth = std::max([self defaultWindowWidth],
                                   NSWidth([permissionsView_ frame]));
 
   // Set the width of the content view now, so that all the text fields will
   // be sized to fit before their heights and vertical positions are adjusted.
   [self setWidthOfView:contentView_ to:contentWidth];
   [self setWidthOfView:securitySectionView_ to:contentWidth];
   [self setWidthOfView:siteSettingsSectionView_ to:contentWidth];
 
-  CGFloat yPos = info_bubble::kBubbleArrowHeight;
+  CGFloat yPos = 0;
 
   [self layoutSecuritySection];
-  yPos = [self setYPositionOfView:securitySectionView_ to:yPos + kFramePadding];
+  yPos = [self setYPositionOfView:securitySectionView_ to:yPos];
 
-  yPos = [self setYPositionOfView:separatorAfterSecuritySection_
-                               to:yPos + kVerticalSectionMargin];
+  yPos = [self setYPositionOfView:separatorAfterSecuritySection_ to:yPos];
 
   [self layoutSiteSettingsSection];
-  yPos = [self setYPositionOfView:siteSettingsSectionView_
-                               to:yPos + kVerticalSectionMargin];
+  yPos = [self setYPositionOfView:siteSettingsSectionView_ to:yPos];
 
-  [contentView_ setFrame:NSMakeRect(0, 0, NSWidth([contentView_ frame]),
-                                    yPos + kFramePadding)];
+  [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_ to:yPos];
+  yPos = [self setYPositionOfView:identityField_
+                               to:yPos + kSectionVerticalPadding];
 
   [self sizeTextFieldHeightToFit:securitySummaryField_];
   yPos = [self setYPositionOfView:securitySummaryField_
                                to:yPos + kSpacingBeforeSecuritySummary];
 
   if (isDevToolsDisabled_ && certificateId_ == 0) {
     // -removeFromSuperview is idempotent.
     [securityDetailsButton_ removeFromSuperview];
   } else {
     // -addSubview is idempotent.
     [securitySectionView_ addSubview:securityDetailsButton_];
     yPos = [self setYPositionOfView:securityDetailsButton_ to:yPos];
   }
 
   if (resetDecisionsButton_) {
     yPos = [self setYPositionOfView:resetDecisionsButton_
                                  to:yPos + kSpacingBeforeResetDecisionsButton];
   }
 
   // Resize the height based on contents.
-  [self setHeightOfView:securitySectionView_ to:yPos];
+  [self setHeightOfView:securitySectionView_ to:yPos + kSectionVerticalPadding];
 }
 
 - (void)layoutSiteSettingsSection {
   // Start the layout with the first element. Margins are handled by the caller.
   CGFloat yPos = 0;
 
-  yPos = [self setYPositionOfView:cookiesView_ to:yPos];
+  yPos =
+      [self setYPositionOfView:cookiesView_ to:yPos + kSectionVerticalPadding];
 
   if (permissionsPresent_) {
     // Put the permission info just below the link button.
     yPos = [self setYPositionOfView:permissionsView_
                                  to:yPos + kSiteSettingsSectionSpacing];
   }
 
   // Put the link button for site settings just below the permissions.
   // TODO(lgarron): set the position of this based on RTL/LTR.
   // http://code.google.com/p/chromium/issues/detail?id=525304
   yPos += kSiteSettingsSectionSpacing;
-  [siteSettingsButton_ setFrameOrigin:NSMakePoint(kFramePadding, yPos)];
+  [siteSettingsButton_
+      setFrameOrigin:NSMakePoint(kSectionHorizontalPadding, yPos)];
   yPos = NSMaxY([siteSettingsButton_ frame]);
 
   // Resize the height based on contents.
-  [self setHeightOfView:siteSettingsSectionView_ to:yPos];
+  [self setHeightOfView:siteSettingsSectionView_
+                     to:yPos + kSectionVerticalPadding];
 }
 
 // Adjust the size of the window to match the size of the content, and position
 // the bubble anchor appropriately.
 - (void)sizeAndPositionWindow {
   NSRect windowFrame = [contentView_ frame];
   windowFrame.size = [[[self window] contentView] convertSize:windowFrame.size
                                                        toView:nil];
   // Adjust the origin by the difference in height.
   windowFrame.origin = [[self window] frame].origin;
@@ skipping 30 matching lines @@
 
 // Create a new text field and add it to the given array of subviews.
 // The array will retain a reference to the object.
 - (NSTextField*)addText:(const base::string16&)text
                withSize:(CGFloat)fontSize
                    bold:(BOOL)bold
                  toView:(NSView*)view
                 atPoint:(NSPoint)point {
   // Size the text to take up the full available width, with some padding.
   // The height is arbitrary as it will be adjusted later.
-  CGFloat width = NSWidth([view frame]) - point.x - kFramePadding;
+  CGFloat width = NSWidth([view frame]) - point.x - kSectionHorizontalPadding;
   NSRect frame = NSMakeRect(point.x, point.y, width, 100);
   base::scoped_nsobject<NSTextField> textField(
       [[NSTextField alloc] initWithFrame:frame]);
   [self configureTextFieldAsLabel:textField.get()];
   [textField setStringValue:base::SysUTF16ToNSString(text)];
   NSFont* font = bold ? [NSFont boldSystemFontOfSize:fontSize]
                       : [NSFont systemFontOfSize:fontSize];
   [textField setFont:font];
   [self sizeTextFieldHeightToFit:textField];
   [textField setAutoresizingMask:NSViewWidthSizable];
@@ skipping 19 matching lines @@
   // Use an arbitrary position; it will be adjusted in performLayout.
   NSBox* spacer = [self
       horizontalSeparatorWithFrame:NSMakeRect(0, 0, NSWidth([view frame]), 0)];
   [view addSubview:spacer];
   return spacer;
 }
 
 // Add a link button with the given text to |view|.
 - (NSButton*)addLinkButtonWithText:(NSString*)text toView:(NSView*)view {
   // Frame size is arbitrary; it will be adjusted by the layout tweaker.
-  NSRect frame = NSMakeRect(kFramePadding, 0, 100, 10);
+  NSRect frame = NSMakeRect(kSectionHorizontalPadding, 0, 100, 10);
   base::scoped_nsobject<NSButton> button(
       [[NSButton alloc] initWithFrame:frame]);
   base::scoped_nsobject<HyperlinkButtonCell> cell(
       [[HyperlinkButtonCell alloc] initTextCell:text]);
   [cell setControlSize:NSSmallControlSize];
   [button setCell:cell.get()];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
   [view addSubview:button.get()];
 
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
   return button.get();
 }
 
 // Create and return a button with the specified text and add it to the given
 // |view|. |view| retains the new button.
 - (NSButton*)addButtonWithText:(NSString*)text toView:(NSView*)view {
   NSRect containerFrame = [view frame];
   // Frame size is arbitrary; it will be adjusted by the layout tweaker.
-  NSRect frame = NSMakeRect(kFramePadding, 0, 100, 10);
+  NSRect frame = NSMakeRect(kSectionHorizontalPadding, 0, 100, 10);
   base::scoped_nsobject<NSButton> button(
       [[NSButton alloc] initWithFrame:frame]);
 
   // Determine the largest possible size for this button. The size is the width
   // of the connection section minus the padding on both sides minus the
   // connection image size and spacing.
   // TODO(lgarron): handle this sizing in -performLayout.
-  CGFloat maxTitleWidth = containerFrame.size.width - kFramePadding * 2;
+  CGFloat maxTitleWidth =
+      containerFrame.size.width - kSectionHorizontalPadding * 2;
 
   base::scoped_nsobject<NSButtonCell> cell(
       [[NSButtonCell alloc] initTextCell:text]);
   [button setCell:cell.get()];
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
 
   // Ensure the containing view is large enough to contain the button with its
   // widest possible title.
   NSRect buttonFrame = [button frame];
   buttonFrame.size.width = maxTitleWidth;
@@ skipping 44 matching lines @@
                                                         forURL:url
                                                   withCallback:callback]);
   // Determine the largest possible size for this button.
   CGFloat maxTitleWidth = [button
       maxTitleWidthForContentSettingsType:permissionInfo.type
                        withDefaultSetting:permissionInfo.default_setting];
 
   // Ensure the containing view is large enough to contain the button with its
   // widest possible title.
   NSRect containerFrame = [view frame];
-  containerFrame.size.width = std::max(
-      NSWidth(containerFrame), point.x + maxTitleWidth + kFramePadding);
+  containerFrame.size.width =
+      std::max(NSWidth(containerFrame),
+               point.x + maxTitleWidth + kSectionHorizontalPadding);
   [view setFrame:containerFrame];
   [view addSubview:button.get()];
   return button.get();
 }
 
 // Add a delete button for |objectInfo| to the given view.
 - (NSButton*)addDeleteButtonForChosenObject:(ChosenObjectInfoPtr)objectInfo
                                      toView:(NSView*)view
                                     atPoint:(NSPoint)point {
   __block WebsiteSettingsBubbleController* weakSelf = self;
   auto callback =
       base::BindBlock(^(const WebsiteSettingsUI::ChosenObjectInfo& objectInfo) {
         [weakSelf onChosenObjectDeleted:objectInfo];
       });
   base::scoped_nsobject<ChosenObjectDeleteButton> button(
       [[ChosenObjectDeleteButton alloc]
           initWithChosenObject:std::move(objectInfo)
                        atPoint:point
                   withCallback:callback]);
 
   // Ensure the containing view is large enough to contain the button.
   NSRect containerFrame = [view frame];
   containerFrame.size.width =
-      std::max(NSWidth(containerFrame),
-               point.x + kPermissionDeleteImageSize + kFramePadding);
+      std::max(NSWidth(containerFrame), point.x + kPermissionDeleteImageSize +
+                                            kSectionHorizontalPadding);
   [view setFrame:containerFrame];
   [view addSubview:button.get()];
   return button.get();
 }
 
 // Called when the user changes the setting of a permission.
 - (void)onPermissionChanged:(ContentSettingsType)permissionType
                          to:(ContentSetting)newSetting {
   if (presenter_)
     presenter_->OnSitePermissionChanged(permissionType, newSetting);
@@ skipping 23 matching lines @@
 
   NSPoint position;
   NSImageView* imageView;
   NSPopUpButton* button;
   NSTextField* label;
 
   CGFloat viewWidth = NSWidth([view frame]);
 
   if (isRTL) {
     point.x = NSWidth([view frame]) - kPermissionImageSize -
-              kPermissionImageSpacing - kFramePadding;
+              kPermissionImageSpacing - kSectionHorizontalPadding;
     imageView = [self addImageWithSize:[image size] toView:view atPoint:point];
     [imageView setImage:image];
     point.x -= kPermissionImageSpacing;
 
     label = [self addText:labelText
                  withSize:[NSFont smallSystemFontSize]
                      bold:NO
                    toView:view
                   atPoint:point];
     [label sizeToFit];
@@ skipping 69 matching lines @@
 
   NSPoint position;
   NSImageView* imageView;
   NSButton* button;
   NSTextField* label;
 
   CGFloat viewWidth = NSWidth([view frame]);
 
   if (isRTL) {
     point.x = NSWidth([view frame]) - kPermissionImageSize -
-              kPermissionImageSpacing - kFramePadding;
+              kPermissionImageSpacing - kSectionHorizontalPadding;
     imageView = [self addImageWithSize:[image size] toView:view atPoint:point];
     [imageView setImage:image];
     point.x -= kPermissionImageSpacing;
 
     label = [self addText:labelText
                  withSize:[NSFont smallSystemFontSize]
                      bold:NO
                    toView:view
                   atPoint:point];
     [label sizeToFit];
@@ skipping 81 matching lines @@
           IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA, i.allowed);
     }
   }
 
   base::string16 sectionTitle =
       l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TITLE_SITE_DATA);
   bool isRTL = base::i18n::RIGHT_TO_LEFT ==
                base::i18n::GetStringDirection(firstPartyLabelText);
 
   [cookiesView_ setSubviews:[NSArray array]];
-  NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
+  NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
 
   NSTextField* label;
 
   CGFloat viewWidth = NSWidth([cookiesView_ frame]);
 
   NSTextField* header = [self addText:sectionTitle
                              withSize:[NSFont smallSystemFontSize]
                                  bold:YES
                                toView:cookiesView_
                               atPoint:controlOrigin];
   [header sizeToFit];
 
   if (isRTL) {
-    controlOrigin.x = viewWidth - kFramePadding - NSWidth([header frame]);
+    controlOrigin.x =
+        viewWidth - kSectionHorizontalPadding - NSWidth([header frame]);
     [header setFrameOrigin:controlOrigin];
   }
   controlOrigin.y += NSHeight([header frame]) + kPermissionsHeadlineSpacing;
   controlOrigin.y += kPermissionsTabSpacing;
 
   // Reset X for the cookie image.
   if (isRTL) {
     controlOrigin.x = viewWidth - kPermissionImageSize -
-                      kPermissionImageSpacing - kFramePadding;
+                      kPermissionImageSpacing - kSectionHorizontalPadding;
   }
 
   WebsiteSettingsUI::PermissionInfo info;
   info.type = CONTENT_SETTINGS_TYPE_COOKIES;
   info.setting = CONTENT_SETTING_ALLOW;
   // info.default_setting, info.source, and info.is_incognito have not been set,
   // but GetPermissionIcon doesn't use any of those.
   NSImage* image = WebsiteSettingsUI::GetPermissionIcon(info).ToNSImage();
   NSImageView* imageView = [self addImageWithSize:[image size]
                                            toView:cookiesView_
@@ skipping 45 matching lines @@
 
   [cookiesView_ setFrameSize:
       NSMakeSize(NSWidth([cookiesView_ frame]), controlOrigin.y)];
 
   [self performLayout];
 }
 
 - (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList
          andChosenObjects:(const ChosenObjectInfoList&)chosenObjectInfoList {
   [permissionsView_ setSubviews:[NSArray array]];
-  NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
+  NSPoint controlOrigin = NSMakePoint(kSectionHorizontalPadding, 0);
 
   permissionsPresent_ = YES;
 
   if (permissionInfoList.size() > 0 || chosenObjectInfoList.size() > 0) {
     base::string16 sectionTitle = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_TITLE_SITE_PERMISSIONS);
     bool isRTL = base::i18n::RIGHT_TO_LEFT ==
                  base::i18n::GetStringDirection(sectionTitle);
     NSTextField* header = [self addText:sectionTitle
                                withSize:[NSFont smallSystemFontSize]
                                    bold:YES
                                  toView:permissionsView_
                                 atPoint:controlOrigin];
     [header sizeToFit];
     if (isRTL) {
-      controlOrigin.x = NSWidth([permissionsView_ frame]) - kFramePadding -
-                        NSWidth([header frame]);
+      controlOrigin.x = NSWidth([permissionsView_ frame]) -
+                        kSectionHorizontalPadding - NSWidth([header frame]);
       [header setFrameOrigin:controlOrigin];
     }
     controlOrigin.y += NSHeight([header frame]) + kPermissionsHeadlineSpacing;
 
     for (const auto& permission : permissionInfoList) {
       controlOrigin.y += kPermissionsTabSpacing;
       NSPoint rowBottomRight = [self addPermission:permission
                                             toView:permissionsView_
                                            atPoint:controlOrigin];
       controlOrigin.y = rowBottomRight.y;
     }
 
     for (auto* object : chosenObjectInfoList) {
       controlOrigin.y += kPermissionsTabSpacing;
       NSPoint rowBottomRight = [self addChosenObject:base::WrapUnique(object)
                                               toView:permissionsView_
                                              atPoint:controlOrigin];
       controlOrigin.y = rowBottomRight.y;
     }
 
-    controlOrigin.y += kFramePadding;
+    controlOrigin.y += kPermissionsTabSpacing;
   }
 
   [permissionsView_ setFrameSize:
       NSMakeSize(NSWidth([permissionsView_ frame]), controlOrigin.y)];
   [self performLayout];
 }
 
 @end
 
 WebsiteSettingsUIBridge::WebsiteSettingsUIBridge(
@@ skipping 83 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)
 }