Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3448)

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm

Issue 819183002: Plugin Power Saver: Fix DETECT in WebsiteSettingsUI omnibox dropdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0210-plugin-power-saver-fix-website-settings-plugin-ask-backportable
Patch Set: fix mac stuff Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698