Make the cocoa permission bubble match mocks.

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/mac/foundation_util.h"
@@ skipping 24 matching lines @@
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/models/simple_menu_model.h"
 
 using base::UserMetricsAction;
 
 namespace {
 
-const CGFloat kHorizontalPadding = 20.0f;
-const CGFloat kVerticalPadding = 20.0f;
-const CGFloat kButtonPadding = 10.0f;
+const CGFloat kHorizontalPadding = 13.0f;
+const CGFloat kVerticalPadding = 13.0f;
+const CGFloat kBetweenButtonsPadding = 10.0f;
+const CGFloat kButtonRightEdgePadding = 17.0f;
 const CGFloat kTitlePaddingX = 50.0f;
-const CGFloat kTitleFontSize = 15.0f;
-const CGFloat kPermissionFontSize = 12.0f;
+const CGFloat kBubbleMinWidth = 315.0f;
+const NSSize kPermissionIconSize = {18, 18};

[groby-ooo-7-16, 2014/05/21 18:28:37]

General question: Are some of those constants shared across UIs?

[leng, 2014/05/21 22:33:51]

This one currently is not, but may be used by the views code.  I moved it into a
chrome_style namespace in permission_bubble_view.h.  Is that the right place?

[groby-ooo-7-16, 2014/05/21 23:50:28]

Let's not add another namespace. If there's no natural place to keep things,
it's fine in here for now.

 
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(PermissionBubbleController* bubble)
       : bubble_controller_(bubble) {}
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
     return false;
   }
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
     return true;
@@ skipping 30 matching lines @@
 
 @implementation AllowBlockMenuButton
 
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
         delegate:(PermissionBubbleView::Delegate*)delegate {
   if (self = [super initWithFrame:NSZeroRect pullsDown:NO]) {
     ContentSetting setting =
         allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
-    [self setFont:[NSFont systemFontOfSize:kPermissionFontSize]];
+    [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [self setBordered:NO];
 
     __block PermissionBubbleView::Delegate* blockDelegate = delegate;
     __block AllowBlockMenuButton* blockSelf = self;
     PermissionMenuModel::ChangeCallback changeCallback =
         base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
             blockDelegate->ToggleAccept(
                 index, permission.setting == CONTENT_SETTING_ALLOW);
             [blockSelf setFrameSize:
                 SizeForWebsiteSettingsButtonTitle(blockSelf,
@@ skipping 168 matching lines @@
                            verticallyToCenterOf:permissionView];
       [permissionMenus addObject:menu];
       [contentView addSubview:menu];
     }
     yOffset += NSHeight([permissionView frame]);
   }
 
   // The maximum width of the above permissions will dictate the width of the
   // bubble.  It is calculated here so that it can be used for the positioning
   // of the buttons.
-  NSRect bubbleFrame = NSZeroRect;
+  NSRect bubbleFrame = NSMakeRect(0, 0, kVerticalPadding, kBubbleMinWidth);
   for (NSView* view in [contentView subviews]) {
     bubbleFrame = NSUnionRect(
         bubbleFrame, NSInsetRect([view frame], -kHorizontalPadding, 0));
   }
 
   if (customizationMode) {
     // Adjust the horizontal origin for each menu.
     CGFloat xOffset = NSWidth(bubbleFrame) - kHorizontalPadding;
     CGFloat maxMenuWidth = 0;
     for (NSView* view in permissionMenus.get()) {
       [view setFrameOrigin:NSMakePoint(xOffset, NSMinY([view frame]))];
       maxMenuWidth = std::max(maxMenuWidth, NSWidth([view frame]));
     }
     // And add the menu width to the bubble's width.
     bubbleFrame.size.width += maxMenuWidth;
   }
 
   base::scoped_nsobject<NSView> titleView(
       [[self titleWithHostname:requests[0]->GetRequestingHostname().host()]
           retain]);
   [contentView addSubview:titleView];
   [titleView setFrameOrigin:NSMakePoint(kHorizontalPadding,
                                         kVerticalPadding + yOffset)];
-  yOffset += NSHeight([titleView frame]) + kVerticalPadding;
+
+  // Fix the height of the bubble relative to the title.
+  bubbleFrame.size.height = NSMaxY([titleView frame]) + kVerticalPadding +
+                            info_bubble::kBubbleArrowHeight;
 
   // The title must fit within the bubble.
   bubbleFrame.size.width = std::max(NSWidth(bubbleFrame),
                                     NSWidth([titleView frame]));
 
   // 'x' button in the upper-right-hand corner.
   base::scoped_nsobject<NSView> closeButton([[self closeButton] retain]);
+  CGFloat offsetFromTop = chrome_style::kCloseButtonPadding +
+                          NSHeight([closeButton frame]) +
+                          info_bubble::kBubbleArrowHeight;
   // Place the close button at the rightmost edge of the bubble.
-  [closeButton setFrameOrigin:NSMakePoint(
-      NSMaxX(bubbleFrame), yOffset - chrome_style::kCloseButtonPadding)];
+  [closeButton
+      setFrameOrigin:NSMakePoint(NSWidth(bubbleFrame),
+                                 NSHeight(bubbleFrame) - offsetFromTop)];
   // Increase the size of the bubble by the width of the close button and its
   // padding.
   bubbleFrame.size.width +=
       NSWidth([closeButton frame]) + chrome_style::kCloseButtonPadding;
   [contentView addSubview:closeButton];
 
   // Position the allow/ok button.
   CGFloat xOrigin = NSWidth(bubbleFrame) - NSWidth([allowOrOkButton frame]) -
-      kHorizontalPadding;
+                    kButtonRightEdgePadding;
   [allowOrOkButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
   [contentView addSubview:allowOrOkButton];
 
   if (!customizationMode) {
     base::scoped_nsobject<NSView> blockButton;
     if (singlePermission)
       blockButton.reset([[self blockButton] retain]);
     else
       blockButton.reset([[self blockButtonWithCustomizeMenu] retain]);
     CGFloat width = [PermissionBubbleController matchWidthsOf:blockButton
                                                         andOf:allowOrOkButton];
     // Ensure the allow/ok button is still in the correct position.
     xOrigin = NSWidth(bubbleFrame) - width - kHorizontalPadding;
     [allowOrOkButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
     // Line up the block button.
-    xOrigin = NSMinX([allowOrOkButton frame]) - width - kButtonPadding;
+    xOrigin = NSMinX([allowOrOkButton frame]) - width - kBetweenButtonsPadding;
     [blockButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
     [contentView addSubview:blockButton];
   }
 
-  bubbleFrame.size.height = yOffset + kVerticalPadding;
   bubbleFrame = [[self window] frameRectForContentRect:bubbleFrame];
-
   if ([[self window] isVisible]) {
     // Unfortunately, calling -setFrame followed by -setFrameOrigin  (called
     // within -setAnchorPoint) causes flickering.  Avoid the flickering by
     // manually adjusting the new frame's origin so that the top left stays the
     // same, and only calling -setFrame.
     NSRect currentWindowFrame = [[self window] frame];
     bubbleFrame.origin = currentWindowFrame.origin;
     bubbleFrame.origin.y = bubbleFrame.origin.y +
         currentWindowFrame.size.height - bubbleFrame.size.height;
     [[self window] setFrame:bubbleFrame display:YES];
   } else {
     [[self window] setFrame:bubbleFrame display:NO];
     [self setAnchorPoint:anchorPoint];
     [self showWindow:nil];
   }
 }
 
 - (NSView*)labelForRequest:(PermissionBubbleRequest*)request {
   DCHECK(request);
   base::scoped_nsobject<NSView> permissionView(
       [[NSView alloc] initWithFrame:NSZeroRect]);
   base::scoped_nsobject<NSImageView> permissionIcon(
       [[NSImageView alloc] initWithFrame:NSZeroRect]);
   [permissionIcon setImage:ui::ResourceBundle::GetSharedInstance().
       GetNativeImageNamed(request->GetIconID()).ToNSImage()];
-  [permissionIcon setFrameSize:[[permissionIcon image] size]];
+  [permissionIcon setFrameSize:kPermissionIconSize];

[groby-ooo-7-16, 2014/05/21 18:28:37]

Are you sure you want scaling if the icon is not 18x18? Do you want to DCHECK
icon size?

[leng, 2014/05/21 22:33:51]

The scaling is deliberate - I didn't want to recreate all of the icons, since
they are only rough versions anyhow.

[groby-ooo-7-16, 2014/05/21 23:50:28]

Done.

   [permissionView addSubview:permissionIcon];
 
   base::scoped_nsobject<NSTextField> permissionLabel(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   base::string16 label = request->GetMessageTextFragment();
   [permissionLabel setDrawsBackground:NO];
   [permissionLabel setBezeled:NO];
   [permissionLabel setEditable:NO];
   [permissionLabel setSelectable:NO];
-  [permissionLabel setFont:[NSFont systemFontOfSize:kPermissionFontSize]];
+  [permissionLabel
+      setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [permissionLabel setStringValue:base::SysUTF16ToNSString(label)];
   [permissionLabel sizeToFit];
   [permissionLabel setFrameOrigin:
       NSMakePoint(NSWidth([permissionIcon frame]), 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.
@@ skipping 16 matching lines @@
 - (NSView*)titleWithHostname:(const std::string&)host {
   base::scoped_nsobject<NSTextField> titleView(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   [titleView setDrawsBackground:NO];
   [titleView setBezeled:NO];
   [titleView setEditable:NO];
   [titleView setSelectable:NO];
   [titleView setStringValue:
       l10n_util::GetNSStringF(IDS_PERMISSIONS_BUBBLE_PROMPT,
                               base::UTF8ToUTF16(host))];
-  [titleView setFont:[NSFont systemFontOfSize:kTitleFontSize]];
+  [titleView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [titleView sizeToFit];
   NSRect titleFrame = [titleView frame];
   [titleView setFrameSize:NSMakeSize(NSWidth(titleFrame) + kTitlePaddingX,
                                      NSHeight(titleFrame))];
   return titleView.autorelease();
 }
 
 - (NSView*)menuForRequest:(PermissionBubbleRequest*)request
                   atIndex:(int)index
                     allow:(BOOL)allow {
@@ skipping 95 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