| 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 baf5acb758b339a55ab8dada0519483731af036c..f7481c6a5d2fc5bf8629209f79d3080cf0596105 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);
|
| }
|
|
|