| Index: ash/drag_drop/drag_drop_controller_unittest.cc
|
| diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
|
| index 20513e1f0491adb5a6abdc5d59d75657cd7e2b3d..7c7f02c1fb03fb55f401ead39144eaa80732777b 100644
|
| --- a/ash/drag_drop/drag_drop_controller_unittest.cc
|
| +++ b/ash/drag_drop/drag_drop_controller_unittest.cc
|
| @@ -720,8 +720,10 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
|
| // EventGenerator since it implicitly turns these into mouse drag events.
|
| // 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, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_move(
|
| + ui::ET_MOUSE_MOVED, mouse_move_location, mouse_move_location,
|
| + ui::EventTimeForNow(), 0, 0,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()->
|
| GetHost()->event_processor()->OnEventFromSource(&mouse_move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| @@ -1005,15 +1007,17 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) {
|
| GetDragImageWindow()->AddObserver(&observer);
|
|
|
| {
|
| - ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0),
|
| - gfx::Point(200, 0), ui::EventTimeForNow(), ui::EF_NONE,
|
| - ui::EF_NONE);
|
| + ui::MouseEvent e(
|
| + ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0),
|
| + ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| drag_drop_controller_->DragUpdate(window, e);
|
| }
|
| {
|
| - ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0),
|
| - gfx::Point(600, 0), ui::EventTimeForNow(), ui::EF_NONE,
|
| - ui::EF_NONE);
|
| + ui::MouseEvent e(
|
| + ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0),
|
| + ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| drag_drop_controller_->DragUpdate(window, e);
|
| }
|
|
|
| @@ -1038,15 +1042,17 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) {
|
| GetDragImageWindow()->AddObserver(&observer);
|
|
|
| {
|
| - ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0),
|
| - gfx::Point(600, 0), ui::EventTimeForNow(), ui::EF_NONE,
|
| - ui::EF_NONE);
|
| + ui::MouseEvent e(
|
| + ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0),
|
| + ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| drag_drop_controller_->DragUpdate(window, e);
|
| }
|
| {
|
| - ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0),
|
| - gfx::Point(200, 0), ui::EventTimeForNow(), ui::EF_NONE,
|
| - ui::EF_NONE);
|
| + ui::MouseEvent e(
|
| + ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0),
|
| + ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| drag_drop_controller_->DragUpdate(window, e);
|
| }
|
|
|
|
|