Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3504)

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « ash/drag_drop/drag_drop_controller.h ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698