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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 131 matching lines @@
       forButtonState:image_button_cell::kHoverState];
     [cell setImageID:IDR_BROWSER_ACTION_P
       forButtonState:image_button_cell::kPressedState];
     [cell setImageID:IDR_BROWSER_ACTION
       forButtonState:image_button_cell::kDisabledState];
 
     [self setTitle:@""];
     [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;
     iconFactoryBridge_.reset(new ExtensionActionIconFactoryBridge(
         self, browser->profile(), extension));
 
     moveAnimation_.reset([[NSViewAnimation alloc] init]);
     [moveAnimation_ gtm_setDuration:kAnimationDuration
                           eventMask:NSLeftMouseUpMask];
     [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
@@ skipping 176 matching lines @@
                operation:NSCompositeSourceOver
                 fraction:enabled ? 1.0 : 0.4
           respectFlipped:YES
                    hints:nil];
 
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
 }
 
 @end