| Index: views/controls/button/menu_button.cc
|
| diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
|
| index 3ada964f2c6e0bd7224bf69c78ebbb1377630626..3451434e6276f500083018bd550a23756c3d43ae 100644
|
| --- a/views/controls/button/menu_button.cc
|
| +++ b/views/controls/button/menu_button.cc
|
| @@ -198,17 +198,17 @@ bool MenuButton::OnMousePressed(const MouseEvent& event) {
|
| return true;
|
| }
|
|
|
| -void MenuButton::OnMouseReleased(const MouseEvent& event, bool canceled) {
|
| +void MenuButton::OnMouseReleased(const MouseEvent& event) {
|
| // 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(event.location()) != ui::DragDropTypes::DRAG_NONE &&
|
| - state() != BS_DISABLED && !canceled && !InDrag() &&
|
| - event.IsOnlyLeftMouseButton() && HitTest(event.location())) {
|
| + state() != BS_DISABLED && !InDrag() && event.IsOnlyLeftMouseButton() &&
|
| + HitTest(event.location())) {
|
| Activate();
|
| } else {
|
| - TextButton::OnMouseReleased(event, canceled);
|
| + TextButton::OnMouseReleased(event);
|
| }
|
| }
|
|
|
|
|