| Index: ui/views/controls/scroll_view.cc
|
| ===================================================================
|
| --- ui/views/controls/scroll_view.cc (revision 151481)
|
| +++ ui/views/controls/scroll_view.cc (working copy)
|
| @@ -400,7 +400,7 @@
|
| return processed;
|
| }
|
|
|
| -ui::GestureStatus ScrollView::OnGestureEvent(const GestureEvent& event) {
|
| +ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
|
| ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
|
|
|
| // If the event happened on one of the scrollbars, then those events are
|
| @@ -421,7 +421,7 @@
|
| return status;
|
| }
|
|
|
| -bool ScrollView::OnMouseWheel(const MouseWheelEvent& e) {
|
| +bool ScrollView::OnMouseWheel(const ui::MouseWheelEvent& e) {
|
| bool processed = false;
|
| // Give vertical scrollbar priority
|
| if (vert_sb_->visible())
|
|
|