| Index: ui/views/controls/scrollbar/base_scroll_bar.h
|
| diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h
|
| index 0d09c71d2b353f4a84fb6eab1d960ba3a05890f2..c674dde1d52d2664273608b33b66ec573e146d22 100644
|
| --- a/ui/views/controls/scrollbar/base_scroll_bar.h
|
| +++ b/ui/views/controls/scrollbar/base_scroll_bar.h
|
| @@ -64,7 +64,7 @@ class VIEWS_EXPORT BaseScrollBar : public ScrollBar,
|
| virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE;
|
| virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
|
|
|
|