[OSX] Fix alignment for permission bubble.

chrome/browser/ui/cocoa/website_settings/permission_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/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 21 matching lines @@
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/models/simple_menu_model.h"
 
 using base::UserMetricsAction;
 
 namespace {
 
+// Distance between permission icon and permission label.
+const CGFloat kHorizontalIconPadding = 8.0f;
+
+// Distance between two permission labels.
+const CGFloat kVerticalPermissionPadding = 2.0f;
+
 const CGFloat kHorizontalPadding = 13.0f;
-const CGFloat kVerticalPadding = 13.0f;
+const CGFloat kVerticalPadding = 15.0f;
 const CGFloat kBetweenButtonsPadding = 10.0f;
 const CGFloat kButtonRightEdgePadding = 17.0f;
 const CGFloat kTitlePaddingX = 50.0f;
 const CGFloat kBubbleMinWidth = 315.0f;
 const NSSize kPermissionIconSize = {18, 18};
 
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(PermissionBubbleController* bubble)
       : bubble_controller_(bubble) {}
@@ skipping 235 matching lines @@
                                           action:@selector(onAllow:)] retain]);
   }
   CGFloat yOffset = 2 * kVerticalPadding + NSMaxY([allowOrOkButton frame]);
   BOOL singlePermission = requests.size() == 1;
 
   base::scoped_nsobject<NSMutableArray> permissionMenus;
   if (customizationMode)
     permissionMenus.reset([[NSMutableArray alloc] init]);
 
   CGFloat maxPermissionLineWidth = 0;
+  CGFloat verticalPadding = 0.0f;
   for (auto it = requests.begin(); it != requests.end(); it++) {
     base::scoped_nsobject<NSView> permissionView(
         [[self labelForRequest:(*it)] retain]);
     NSPoint origin = [permissionView frame].origin;
     origin.x += kHorizontalPadding;
-    origin.y += yOffset;
+    origin.y += yOffset + verticalPadding;
     [permissionView setFrameOrigin:origin];
     [contentView addSubview:permissionView];
 
     if (customizationMode) {
       int index = it - requests.begin();
       base::scoped_nsobject<NSView> menu(
           [[self menuForRequest:(*it)
                         atIndex:index
                           allow:acceptStates[index] ? YES : NO] retain]);
       // Align vertically.  Horizontal alignment will be adjusted once the
       // widest permission is know.
       [PermissionBubbleController alignCenterOf:menu
                            verticallyToCenterOf:permissionView];
       [permissionMenus addObject:menu];
       [contentView addSubview:menu];
     }
     maxPermissionLineWidth = std::max(
         maxPermissionLineWidth, NSMaxX([permissionView frame]));
     yOffset += NSHeight([permissionView frame]);
+
+    // Add extra padding for all but first permission.
+    verticalPadding = kVerticalPermissionPadding;
   }
 
   base::scoped_nsobject<NSView> titleView(
       [[self titleWithHostname:requests[0]->GetRequestingHostname().host()]
           retain]);
   [contentView addSubview:titleView];
   [titleView setFrameOrigin:NSMakePoint(kHorizontalPadding,
                                         kVerticalPadding + yOffset)];
 
   // 'x' button in the upper-right-hand corner.
@@ skipping 105 matching lines @@
   base::string16 label = request->GetMessageTextFragment();
   [permissionLabel setDrawsBackground:NO];
   [permissionLabel setBezeled:NO];
   [permissionLabel setEditable:NO];
   [permissionLabel setSelectable:NO];
   [permissionLabel
       setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [permissionLabel setStringValue:base::SysUTF16ToNSString(label)];
   [permissionLabel sizeToFit];
   [permissionLabel setFrameOrigin:
-      NSMakePoint(NSWidth([permissionIcon frame]), 0)];
+      NSMakePoint(NSWidth([permissionIcon frame]) + kHorizontalIconPadding, 0)];
   [permissionView addSubview:permissionLabel];
 
   // Match the horizontal centers of the two subviews.  Note that the label's
   // center is rounded down, and the icon's center, up.  It looks better that
   // way - with the text's center slightly lower than the icon's center - if the
   // height delta is not evenly split.
   NSRect iconFrame = [permissionIcon frame];
   NSRect labelFrame = [permissionLabel frame];
   NSRect unionFrame = NSUnionRect(iconFrame, labelFrame);
 
@@ skipping 128 matching lines @@
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 @end  // implementation PermissionBubbleController