From d44efe090c5dd46b2857aaaca9c939dfbb3cba0b Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 18 Dec 2012 06:08:18 +0000 Subject: events: Update mouse-event handlers to not return EventResult. This is the last step. Once this is done, we can possibly hide EventResult. BUG=163618 Review URL: https://codereview.chromium.org/11592011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173653 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/drag_drop/drag_drop_controller.cc | 16 ++++++++++------ ash/drag_drop/drag_drop_controller.h | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'ash/drag_drop') diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 91aa4a7..5d1611e 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 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) { diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 49dfb65ed..8c4e6bb 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -66,7 +66,7 @@ class ASH_EXPORT DragDropController // Overridden from ui::EventHandler: virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; - virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; + virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; -- cgit v1.1