Cocoa Page Info: Take built-in padding into account for "Site settings" button placement.

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 52 matching lines @@
 const CGFloat kDefaultWindowWidth = 320;
 
 // Padding around each section
 const CGFloat kSectionVerticalPadding = 20;
 const CGFloat kSectionHorizontalPadding = 16;
 
 // Links are buttons with invisible padding, so we need to move them back to
 // align with other text.
 const CGFloat kLinkButtonXAdjustment = 1;
 
+// Built-in margin for NSButton to take into account.
+const CGFloat kNSButtonBuiltinMargin = 4;
+
 // Security Section ------------------------------------------------------------
 
 // Spacing between security summary, security details, and cert decisions text.
 const CGFloat kSecurityParagraphSpacing = 12;
 
 // Site Settings Section -------------------------------------------------------
 
 // Square size of the permission images.
 const CGFloat kPermissionImageSize = 16;
 
@@ skipping 351 matching lines @@
 // Handler for the link button to revoke user certificate decisions.
 - (void)resetCertificateDecisions:(id)sender {
   DCHECK(resetDecisionsButton_);
   presenter_->OnRevokeSSLErrorBypassButtonPressed();
   [self close];
 }
 
 - (CGFloat)layoutViewAtRTLStart:(NSView*)view withYPosition:(CGFloat)yPos {
   CGFloat xPos;
   if (base::i18n::IsRTL()) {
-    xPos =
-        kDefaultWindowWidth - kSectionHorizontalPadding - NSWidth([view frame]);
+    xPos = kDefaultWindowWidth - kSectionHorizontalPadding -
+           NSWidth([view frame]) + kNSButtonBuiltinMargin;
   } else {
-    xPos = kSectionHorizontalPadding;
+    xPos = kSectionHorizontalPadding - kNSButtonBuiltinMargin;
   }
-  [view setFrameOrigin:NSMakePoint(xPos, yPos)];
-  return yPos + NSHeight([view frame]);
+  [view setFrameOrigin:NSMakePoint(xPos, yPos - kNSButtonBuiltinMargin)];
+  return yPos + NSHeight([view frame]) - kNSButtonBuiltinMargin;
 }
 
 // Set the Y position of |view| to the given position, and return the position
 // of its bottom edge.
 - (CGFloat)setYPositionOfView:(NSView*)view to:(CGFloat)position {
   NSRect frame = [view frame];
   frame.origin.y = position;
   [view setFrame:frame];
   return position + NSHeight(frame);
 }
@@ skipping 748 matching lines @@
     const CookieInfoList& cookie_info_list) {
   [bubble_controller_ setCookieInfo:cookie_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }