| Index: ui/views/controls/slider.cc
|
| diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
|
| index ab3d5886b8af7d2f635d463e1ed7072990951347..890a28f606da6849c9f2257ae7673a46d554f698 100644
|
| --- a/ui/views/controls/slider.cc
|
| +++ b/ui/views/controls/slider.cc
|
| @@ -261,15 +261,15 @@ bool Slider::OnKeyPressed(const ui::KeyEvent& event) {
|
| return false;
|
| }
|
|
|
| -ui::GestureStatus Slider::OnGestureEvent(const ui::GestureEvent& event) {
|
| +ui::EventResult Slider::OnGestureEvent(const ui::GestureEvent& event) {
|
| if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE ||
|
| event.type() == ui::ET_GESTURE_SCROLL_BEGIN ||
|
| event.type() == ui::ET_GESTURE_SCROLL_END ||
|
| event.type() == ui::ET_GESTURE_TAP_DOWN) {
|
| MoveButtonTo(event.location());
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| }
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| void Slider::AnimationProgressed(const ui::Animation* animation) {
|
|
|