| Index: views/controls/button/button_dropdown.cc
|
| diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
|
| index c2da5982ac487c75f04bd9751c3c15bcbe52272f..7afdbd5231a7bb406603ba6e5f19d0a67944999e 100644
|
| --- a/views/controls/button/button_dropdown.cc
|
| +++ b/views/controls/button/button_dropdown.cc
|
| @@ -73,17 +73,12 @@ bool ButtonDropDown::OnMouseDragged(const MouseEvent& event) {
|
| return result;
|
| }
|
|
|
| -void ButtonDropDown::OnMouseReleased(const MouseEvent& event, bool canceled) {
|
| - // Showing the drop down results in a MouseReleased with a canceled drag, we
|
| - // need to ignore it.
|
| - if (!canceled && (IsTriggerableEvent(event) ||
|
| - (event.IsRightMouseButton() && !HitTest(event.location())))) {
|
| - ImageButton::OnMouseReleased(event, canceled);
|
| +void ButtonDropDown::OnMouseReleased(const MouseEvent& event) {
|
| + if (IsTriggerableEvent(event) ||
|
| + (event.IsRightMouseButton() && !HitTest(event.location()))) {
|
| + ImageButton::OnMouseReleased(event);
|
| }
|
|
|
| - if (canceled)
|
| - return;
|
| -
|
| if (IsTriggerableEvent(event))
|
| show_menu_factory_.RevokeAll();
|
|
|
|
|