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 91aa4a7ebca4cca8cd03ed06b3af080d63e15ba5..5d1611ed5595508978710c9c00e3915576d7151e 100644 |
--- a/ash/drag_drop/drag_drop_controller.cc |
+++ b/ash/drag_drop/drag_drop_controller.cc |
@@ -292,19 +292,23 @@ void DragDropController::OnKeyEvent(ui::KeyEvent* event) { |
} |
} |
-ui::EventResult DragDropController::OnMouseEvent(ui::MouseEvent* event) { |
+void DragDropController::OnMouseEvent(ui::MouseEvent* event) { |
if (!IsDragDropInProgress()) |
- return ui::ER_UNHANDLED; |
+ return; |
// If current drag session was not started by mouse, dont process this mouse |
// event, but consume it so it does not interfere with current drag session. |
- if (current_drag_event_source_ != ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE) |
- return ui::ER_CONSUMED; |
+ if (current_drag_event_source_ != |
+ ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE) { |
+ event->StopPropagation(); |
+ return; |
+ } |
aura::Window* translated_target = drag_drop_tracker_->GetTarget(*event); |
if (!translated_target) { |
DragCancel(); |
- return ui::ER_CONSUMED; |
+ event->StopPropagation(); |
+ return; |
} |
scoped_ptr<ui::LocatedEvent> translated_event( |
drag_drop_tracker_->ConvertEvent(translated_target, *event)); |
@@ -321,7 +325,7 @@ ui::EventResult DragDropController::OnMouseEvent(ui::MouseEvent* event) { |
// (aura::RootWindow::PostMouseMoveEventAfterWindowChange). |
break; |
} |
- return ui::ER_CONSUMED; |
+ event->StopPropagation(); |
} |
void DragDropController::OnTouchEvent(ui::TouchEvent* event) { |