diff options
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index f3d0343..91aa4a7 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -285,12 +285,11 @@ bool DragDropController::IsDragDropInProgress() { return !!drag_drop_tracker_.get(); } -ui::EventResult DragDropController::OnKeyEvent(ui::KeyEvent* event) { +void DragDropController::OnKeyEvent(ui::KeyEvent* event) { if (IsDragDropInProgress() && event->key_code() == ui::VKEY_ESCAPE) { DragCancel(); - return ui::ER_CONSUMED; + event->StopPropagation(); } - return ui::ER_UNHANDLED; } ui::EventResult DragDropController::OnMouseEvent(ui::MouseEvent* event) { |