Index: chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
index 6879d92b07715b6dd6afb073c881072f8904aaab..7cd63feb945ff2eefd754f42cadafef2b5c57e43 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
@@ -149,14 +149,16 @@ class ExtensionActionIconFactoryBridge |
[self setButtonType:NSMomentaryChangeButton]; |
[self setShowsBorderOnlyWhileMouseInside:YES]; |
- contextMenuController_.reset([[ExtensionActionContextMenuController alloc] |
- initWithExtension:extension |
- browser:browser |
- extensionAction:browser_action]); |
- base::scoped_nsobject<NSMenu> contextMenu( |
- [[NSMenu alloc] initWithTitle:@""]); |
- [contextMenu setDelegate:self]; |
- [self setMenu:contextMenu]; |
+ if (extension->ShowConfigureContextMenus()) { |
+ contextMenuController_.reset([[ExtensionActionContextMenuController alloc] |
+ initWithExtension:extension |
+ browser:browser |
+ extensionAction:browser_action]); |
+ base::scoped_nsobject<NSMenu> contextMenu( |
+ [[NSMenu alloc] initWithTitle:@""]); |
+ [contextMenu setDelegate:self]; |
+ [self setMenu:contextMenu]; |
+ } |
tabId_ = tabId; |
extension_ = extension; |