diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 21:20:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 21:20:50 +0000 |
| commit | f58bbf1c0177717e5541eef8f81d15d44761bb54 (patch) | |
| tree | 401b8e12f485fb59075364e3f375ed4327fd2840 /ash/drag_drop | |
| parent | c02c62ddc7f422440977d51011ae7d84ae5bee76 (diff) | |
| download | chromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.zip chromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.tar.gz chromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.tar.bz2 | |
Changes MouseEvent constructor to take changed_button_flags.
I want this for EventGenerator, but it seems best to make everyone
think about this rather than create another constructor.
BUG=none
TEST=none
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/101573006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 6 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_tracker.cc | 4 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_tracker_unittest.cc | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index baf5acb..f7481c6 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -736,7 +736,7 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) { // The DragDropController should simply ignore these events. gfx::Point mouse_move_location = drag_view->bounds().CenterPoint(); ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, mouse_move_location, - mouse_move_location, 0); + mouse_move_location, 0, 0); Shell::GetPrimaryRootWindow()->GetDispatcher()->AsRootWindowHostDelegate()-> OnHostMouseEvent(&mouse_move); } @@ -1022,6 +1022,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0), + ui::EF_NONE, ui::EF_NONE); drag_drop_controller_->DragUpdate(window, e); } @@ -1029,6 +1030,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0), + ui::EF_NONE, ui::EF_NONE); drag_drop_controller_->DragUpdate(window, e); } @@ -1057,6 +1059,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0), + ui::EF_NONE, ui::EF_NONE); drag_drop_controller_->DragUpdate(window, e); } @@ -1064,6 +1067,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0), + ui::EF_NONE, ui::EF_NONE); drag_drop_controller_->DragUpdate(window, e); } diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 03ecf79..32fb417 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -74,7 +74,9 @@ ui::LocatedEvent* DragDropTracker::ConvertEvent( return new ui::MouseEvent(event.type(), target_location, target_root_location, - event.flags()); + event.flags(), + static_cast<const ui::MouseEvent&>(event). + changed_button_flags()); } } // namespace internal diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc index ec2bc15..41eb089 100644 --- a/ash/drag_drop/drag_drop_tracker_unittest.cc +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc @@ -37,6 +37,7 @@ class DragDropTrackerTest : public test::AshTestBase { ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, location, location, + ui::EF_NONE, ui::EF_NONE); aura::Window* target = tracker->GetTarget(e); return target; @@ -147,6 +148,7 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) { ui::MouseEvent original00(ui::ET_MOUSE_DRAGGED, gfx::Point(50, 50), gfx::Point(50, 50), + ui::EF_NONE, ui::EF_NONE); scoped_ptr<ui::LocatedEvent> converted00(ConvertEvent(window0.get(), original00)); @@ -160,6 +162,7 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) { ui::MouseEvent original01(ui::ET_MOUSE_DRAGGED, gfx::Point(350, 150), gfx::Point(350, 150), + ui::EF_NONE, ui::EF_NONE); scoped_ptr<ui::LocatedEvent> converted01(ConvertEvent(window1.get(), original01)); @@ -176,6 +179,7 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) { ui::MouseEvent original10(ui::ET_MOUSE_DRAGGED, gfx::Point(-150, 50), gfx::Point(-150, 50), + ui::EF_NONE, ui::EF_NONE); scoped_ptr<ui::LocatedEvent> converted10(ConvertEvent(window0.get(), original10)); @@ -189,6 +193,7 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) { ui::MouseEvent original11(ui::ET_MOUSE_DRAGGED, gfx::Point(150, 150), gfx::Point(150, 150), + ui::EF_NONE, ui::EF_NONE); scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(), original11)); |