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 f3d034393c1db7c65bfaf47209effaa78a57fcd1..91aa4a7ebca4cca8cd03ed06b3af080d63e15ba5 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) { |