| Index: ui/views/controls/scroll_view.h
|
| diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
|
| index 1eb0e5644432dfbc04e89dba51eb74f34e1848d6..84eb8760d6971a80484d2fc8d0c7108a81829d57 100644
|
| --- a/ui/views/controls/scroll_view.h
|
| +++ b/ui/views/controls/scroll_view.h
|
| @@ -79,7 +79,7 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
|
| virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE;
|
|
|
| // Overridden from ui::EventHandler:
|
| - virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
| virtual std::string GetClassName() const OVERRIDE;
|
|
|
|
|