| Index: ui/views/widget/root_view.h
|
| ===================================================================
|
| --- ui/views/widget/root_view.h (revision 151481)
|
| +++ ui/views/widget/root_view.h (working copy)
|
| @@ -103,10 +103,11 @@
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual bool OnMouseWheel(const MouseWheelEvent& event) OVERRIDE;
|
| - virtual bool OnScrollEvent(const ScrollEvent& event) OVERRIDE;
|
| - virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(const GestureEvent& event) OVERRIDE;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
|
| + virtual ui::TouchStatus OnTouchEvent(const ui::TouchEvent& event) OVERRIDE;
|
| + virtual ui::GestureStatus OnGestureEvent(
|
| + const ui::GestureEvent& event) OVERRIDE;
|
| virtual void SetMouseHandler(View* new_mouse_handler) OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| virtual void ReorderChildLayers(ui::Layer* parent_layer) OVERRIDE;
|
|
|