diff options
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 5 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 2 |
2 files changed, 3 insertions, 4 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) { diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index bef79a0..49dfb65ed 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -65,7 +65,7 @@ class ASH_EXPORT DragDropController virtual bool IsDragDropInProgress() OVERRIDE; // Overridden from ui::EventHandler: - virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; + virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |