Index: chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm |
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm b/chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm |
index 38448359848197eb9e5be0be759739f009abe21f..6cc2466abe1c78cb8ee47f0eac7ffed6b9b49306 100644 |
--- a/chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm |
+++ b/chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm |
@@ -31,9 +31,8 @@ |
// Set the button title. |
base::scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]); |
base::string16 buttonTitle = WebsiteSettingsUI::PermissionActionToUIString( |
- permissionInfo.setting, |
- permissionInfo.default_setting, |
- permissionInfo.source); |
+ permissionInfo.type, permissionInfo.setting, |
+ permissionInfo.default_setting, permissionInfo.source); |
[titleItem setTitle:base::SysUTF16ToNSString(buttonTitle)]; |
[[self cell] setUsesItemFromMenu:NO]; |
[[self cell] setMenuItem:titleItem.get()]; |
@@ -46,14 +45,14 @@ |
return self; |
} |
-- (CGFloat)maxTitleWidthWithDefaultSetting:(ContentSetting)defaultSetting { |
+- (CGFloat)maxTitleWidthForContentSettingsType:(ContentSettingsType)type |
+ withDefaultSetting:(ContentSetting)defaultSetting { |
// Determine the largest possible size for this button. |
CGFloat maxTitleWidth = 0; |
for (NSMenuItem* item in [self itemArray]) { |
NSString* title = |
base::SysUTF16ToNSString(WebsiteSettingsUI::PermissionActionToUIString( |
- static_cast<ContentSetting>([item tag]), |
- defaultSetting, |
+ type, static_cast<ContentSetting>([item tag]), defaultSetting, |
content_settings::SETTING_SOURCE_USER)); |
NSSize size = SizeForWebsiteSettingsButtonTitle(self, title); |
maxTitleWidth = std::max(maxTitleWidth, size.width); |