| Index: ui/views/controls/scrollbar/native_scroll_bar.h
|
| diff --git a/ui/views/controls/scrollbar/native_scroll_bar.h b/ui/views/controls/scrollbar/native_scroll_bar.h
|
| index dbeb5528e2fa1c4186d8102e921ac5c4769ecea8..7e3416cd24f0099b3ea5b0ab5d0e6128bcb7a394 100644
|
| --- a/ui/views/controls/scrollbar/native_scroll_bar.h
|
| +++ b/ui/views/controls/scrollbar/native_scroll_bar.h
|
| @@ -45,7 +45,7 @@ class VIEWS_EXPORT NativeScrollBar : public ScrollBar {
|
|
|
| // Overrideen from View for keyboard UI purpose.
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(const ui::GestureEvent& e) OVERRIDE;
|
| + virtual ui::EventResult OnGestureEvent(const ui::GestureEvent& e) OVERRIDE;
|
| virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE;
|
|
|
| // Overridden from ScrollBar.
|
|
|