Revert 259625 "Disabled context menu for external component exte..."

trunk/src/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

Index: trunk/src/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/extensions/browser_action_button.mm	(revision 261492)
+++ trunk/src/chrome/browser/ui/cocoa/extensions/browser_action_button.mm	(working copy)
@@ -149,16 +149,14 @@
     [self setButtonType:NSMomentaryChangeButton];
     [self setShowsBorderOnlyWhileMouseInside:YES];
 
-    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];
-    }
+    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;