| Index: ui/views/controls/button/custom_button.cc
|
| diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
|
| index 4c131b6dfc97d9b323caf7f7f7874c97ed40078f..122414194d16ab2b0e99d91a17aa12216971ba60 100644
|
| --- a/ui/views/controls/button/custom_button.cc
|
| +++ b/ui/views/controls/button/custom_button.cc
|
| @@ -204,7 +204,7 @@ bool CustomButton::OnKeyReleased(const ui::KeyEvent& event) {
|
| return true;
|
| }
|
|
|
| -ui::GestureStatus CustomButton::OnGestureEvent(const ui::GestureEvent& event) {
|
| +ui::EventResult CustomButton::OnGestureEvent(const ui::GestureEvent& event) {
|
| if (state_ == BS_DISABLED)
|
| return Button::OnGestureEvent(event);
|
|
|
| @@ -215,13 +215,13 @@ ui::GestureStatus CustomButton::OnGestureEvent(const ui::GestureEvent& event) {
|
| SetState(BS_HOT);
|
| hover_animation_->Reset(1.0);
|
| NotifyClick(event);
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| } else if (event.type() == ui::ET_GESTURE_TAP_DOWN &&
|
| ShouldEnterPushedState(event)) {
|
| SetState(BS_PUSHED);
|
| if (request_focus_on_press_)
|
| RequestFocus();
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| } else {
|
| SetState(BS_NORMAL);
|
| }
|
|
|