Fixes regression introduced in fixing 19597. This change effectively...

views/controls/button/menu_button.cc

 // Copyright (c) 2006-2008 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 "views/controls/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 170 matching lines @@
       if (delta_in_milliseconds > kMinimumTimeBetweenButtonClicks) {
         return Activate();
       }
     }
   }
   return true;
 }
 
 void MenuButton::OnMouseReleased(const MouseEvent& e,
                                  bool canceled) {
+  // Explicitly test for left mouse button to show the menu. If we tested for
+  // !IsTriggerableEvent it could lead to a situation where we end up showing
+  // the menu and context menu (this would happen if the right button is not
+  // triggerable and there's a context menu).
   if (GetDragOperations(e.x(), e.y()) != DragDropTypes::DRAG_NONE &&
-      state() != BS_DISABLED && !canceled && !InDrag() && !IsTriggerableEvent(e)
-      && HitTest(e.location())) {
+      state() != BS_DISABLED && !canceled && !InDrag() &&
+      e.IsOnlyLeftMouseButton() && HitTest(e.location())) {
     Activate();
   } else {
     TextButton::OnMouseReleased(e, canceled);
   }
 }
 
 // When the space bar or the enter key is pressed we need to show the menu.
 bool MenuButton::OnKeyReleased(const KeyEvent& e) {
 #if defined(OS_WIN)
   if ((e.GetKeyCode() == base::VKEY_SPACE) ||
@@ skipping 38 matching lines @@
 }
 
 bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
   *state = AccessibilityTypes::STATE_HASPOPUP;
   return true;
 }
 
 }  // namespace views