| Index: ash/drag_drop/drag_drop_controller.h
|
| diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
|
| index dabcbc12d74f904b98559591d30c179cc3613eb3..79f072075a79d44c30b10f5543a324107e2d3ab8 100644
|
| --- a/ash/drag_drop/drag_drop_controller.h
|
| +++ b/ash/drag_drop/drag_drop_controller.h
|
| @@ -69,7 +69,7 @@ class ASH_EXPORT DragDropController
|
| virtual ui::TouchStatus PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) OVERRIDE;
|
|
|
|
|