| Index: ui/views/controls/scroll_view.cc
|
| diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
|
| index 2e8e5a0b2738df0fd381fb881b815bb1f9670f83..013e5850f84bbdde9cb569820cf63d7503cb4395 100644
|
| --- a/ui/views/controls/scroll_view.cc
|
| +++ b/ui/views/controls/scroll_view.cc
|
| @@ -400,8 +400,8 @@ bool ScrollView::OnKeyPressed(const ui::KeyEvent& event) {
|
| return processed;
|
| }
|
|
|
| -ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
|
| - ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
|
| +ui::EventResult ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
|
| + ui::EventResult status = ui::ER_UNHANDLED;
|
|
|
| // If the event happened on one of the scrollbars, then those events are
|
| // sent directly to the scrollbars. Otherwise, only scroll events are sent to
|
| @@ -415,7 +415,7 @@ ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
|
| if (vert_sb_->bounds().Contains(event.location()) || scroll_event)
|
| status = vert_sb_->OnGestureEvent(event);
|
| }
|
| - if (status == ui::GESTURE_STATUS_UNKNOWN && horiz_sb_->visible()) {
|
| + if (status == ui::ER_UNHANDLED && horiz_sb_->visible()) {
|
| if (horiz_sb_->bounds().Contains(event.location()) || scroll_event)
|
| status = horiz_sb_->OnGestureEvent(event);
|
| }
|
|
|