| Index: ui/views/controls/scroll_view.h
|
| diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
|
| index 4c2d0a928c2e99a5d3336947ab2a51a1144c6e01..29ad6165fa1b079e00beac309bcf060863c9c867 100644
|
| --- a/ui/views/controls/scroll_view.h
|
| +++ b/ui/views/controls/scroll_view.h
|
| @@ -73,7 +73,7 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
|
|
|
| // Keyboard events
|
| 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& e) OVERRIDE;
|
|
|
|
|