Changes cocoa implementation of permission bubble to better match mocks.

chrome/browser/ui/cocoa/website_settings/permission_selector_button.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_selector_button.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/browser/ui/website_settings/website_settings_utils.h"
 #import "ui/base/cocoa/menu_controller.h"
@@ skipping 26 matching lines @@
         permissionInfo.setting,
         permissionInfo.default_setting,
         permissionInfo.source);
     [titleItem setTitle:base::SysUTF16ToNSString(buttonTitle)];
     [[self cell] setUsesItemFromMenu:NO];
     [[self cell] setMenuItem:titleItem.get()];
     // Although the frame is reset, below, this sizes the cell properly.
     [self sizeToFit];
 
     // Size the button to just fit the visible title - not all of its items.
-    [self setFrameSize:[self sizeForTitle:[self title]]];
+    [self setFrameSize:[PermissionSelectorButton sizeForTitle:[self title]
+                                                    forButton:self]];
   }
   return self;
 }
 
-// Determine the size of a popup button with the given title.
-- (NSSize)sizeForTitle:(NSString*)title {
-  NSDictionary* textAttributes = @{NSFontAttributeName : [self font]};
++ (NSSize)sizeForTitle:(NSString*)title forButton:(NSButton*)button {

[groby-ooo-7-16, 2014/04/18 18:18:18]

If you can at all, I think I'd move that onto the controller.

[leng, 2014/04/18 22:48:46]

I'll move this to a shared location in a subsequent CL.

+  NSDictionary* textAttributes = @{NSFontAttributeName : [button font]};
   NSSize titleSize = [title sizeWithAttributes:textAttributes];
 
-  NSRect frame = [self frame];
-  NSRect titleRect = [[self cell] titleRectForBounds:frame];
+  NSRect frame = [button frame];
+  NSRect titleRect = [[button cell] titleRectForBounds:frame];
   CGFloat width = titleSize.width + NSWidth(frame) - NSWidth(titleRect);
 
   return NSMakeSize(width + kPermissionButtonTitleRightPadding,
                     NSHeight(frame));
 }
 
 - (CGFloat)maxTitleWidthWithDefaultSetting:(ContentSetting)defaultSetting {
   // Determine the largest possible size for this button.
   CGFloat maxTitleWidth = 0;
   for (NSMenuItem* item in [self itemArray]) {
     base::string16 title = WebsiteSettingsUI::PermissionActionToUIString(
         static_cast<ContentSetting>([item tag]),
         defaultSetting,
         content_settings::SETTING_SOURCE_USER);
-    NSSize size = [self sizeForTitle:base::SysUTF16ToNSString(title)];
+    NSSize size =
+        [PermissionSelectorButton sizeForTitle:base::SysUTF16ToNSString(title)
+                                     forButton:self];
     maxTitleWidth = std::max(maxTitleWidth, size.width);
   }
   return maxTitleWidth;
 }
 
 // Accessor function for testing only.
 - (NSMenu*)permissionMenu {
   return [menuController_ menu];
 }
 
 @end