Revert 192525 "Context menu on views must show on mouse down for..."

trunk/src/chrome/browser/ui/views/browser_action_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/browser_action_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 296 matching lines @@
   // to us.
   return false;
 }
 
 bool BrowserActionButton::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsRightMouseButton()) {
     return IsPopup() ? MenuButton::OnMousePressed(event) :
                        TextButton::OnMousePressed(event);
   }
 
-  if (!views::View::ShouldShowContextMenuOnMousePress()) {
-    // See comments in MenuButton::Activate() as to why this is needed.
-    SetMouseHandler(NULL);
+  // See comments in MenuButton::Activate() as to why this is needed.
+  SetMouseHandler(NULL);
 
-    ShowContextMenu(gfx::Point(), true);
-  }
+  ShowContextMenu(gfx::Point(), true);
   return false;
 }
 
 void BrowserActionButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsPopup() || context_menu_) {
     // TODO(erikkay) this never actually gets called (probably because of the
     // loss of focus).
     MenuButton::OnMouseReleased(event);
   } else {
     TextButton::OnMouseReleased(event);
@@ skipping 71 matching lines @@
 
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
   }
 }