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..70a17834102aa852538087688f0a443f3271b39d 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm |
@@ -153,10 +153,12 @@ class ExtensionActionIconFactoryBridge |
initWithExtension:extension |
browser:browser |
extensionAction:browser_action]); |
- base::scoped_nsobject<NSMenu> contextMenu( |
- [[NSMenu alloc] initWithTitle:@""]); |
- [contextMenu setDelegate:self]; |
- [self setMenu:contextMenu]; |
+ if (extension->ShowConfigureContextMenus()) { |
+ base::scoped_nsobject<NSMenu> contextMenu( |
+ [[NSMenu alloc] initWithTitle:@""]); |
+ [contextMenu setDelegate:self]; |
+ [self setMenu:contextMenu]; |
+ } |
groby-ooo-7-16
2014/03/25 20:10:10
Do we need to reset the menu to nil in an else bra
yefimt
2014/03/25 21:12:17
I don't think it is necessary. It is the only plac
|
tabId_ = tabId; |
extension_ = extension; |