| Index: ash/drag_drop/drag_drop_controller.cc
|
| diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
|
| index 01788dd08822d220da04054f551d6a4c5576ddf5..e1e8a4393c1094cd65dfa35800d3b6749928cc78 100644
|
| --- a/ash/drag_drop/drag_drop_controller.cc
|
| +++ b/ash/drag_drop/drag_drop_controller.cc
|
| @@ -229,14 +229,14 @@ bool DragDropController::PreHandleMouseEvent(aura::Window* target,
|
| return true;
|
| }
|
|
|
| -ui::TouchStatus DragDropController::PreHandleTouchEvent(
|
| +ui::EventResult DragDropController::PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) {
|
| // TODO(sad): Also check for the touch-id.
|
| // TODO(varunjain): Add code for supporting drag-and-drop across displays
|
| // (http://crbug.com/114755).
|
| if (!IsDragDropInProgress())
|
| - return ui::TOUCH_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| switch (event->type()) {
|
| case ui::ET_TOUCH_MOVED:
|
| DragUpdate(target, *event);
|
| @@ -248,9 +248,9 @@ ui::TouchStatus DragDropController::PreHandleTouchEvent(
|
| DragCancel();
|
| break;
|
| default:
|
| - return ui::TOUCH_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
| - return ui::TOUCH_STATUS_CONTINUE;
|
| + return ui::ER_CONSUMED;
|
| }
|
|
|
| ui::EventResult DragDropController::PreHandleGestureEvent(
|
|
|