| Index: ui/views/controls/single_split_view_unittest.cc
|
| diff --git a/ui/views/controls/single_split_view_unittest.cc b/ui/views/controls/single_split_view_unittest.cc
|
| index f56e497bc5197db550e2a105d6d720dc56d246e1..6879b2bae4284cd007dfa45620a53306ea12513b 100644
|
| --- a/ui/views/controls/single_split_view_unittest.cc
|
| +++ b/ui/views/controls/single_split_view_unittest.cc
|
| @@ -169,8 +169,9 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
| split.Layout();
|
|
|
| gfx::Point press_point(7, kInitialDividerOffset + kMouseOffset);
|
| - ui::MouseEvent mouse_pressed(ui::ET_MOUSE_PRESSED, press_point, press_point,
|
| - ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_pressed(
|
| + ui::ET_MOUSE_PRESSED, press_point, press_point, ui::EventTimeForNow(), 0,
|
| + 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ASSERT_TRUE(split.OnMousePressed(mouse_pressed));
|
| EXPECT_EQ(kInitialDividerOffset, split.divider_offset());
|
| EXPECT_EQ(0, listener.count());
|
| @@ -178,8 +179,9 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
| // Drag divider to the bottom.
|
| gfx::Point drag_1_point(
|
| 5, kInitialDividerOffset + kMouseOffset + kMouseMoveDelta);
|
| - ui::MouseEvent mouse_dragged_1(ui::ET_MOUSE_DRAGGED, drag_1_point,
|
| - drag_1_point, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_dragged_1(
|
| + ui::ET_MOUSE_DRAGGED, drag_1_point, drag_1_point, ui::EventTimeForNow(),
|
| + 0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ASSERT_TRUE(split.OnMouseDragged(mouse_dragged_1));
|
| EXPECT_EQ(kInitialDividerOffset + kMouseMoveDelta, split.divider_offset());
|
| EXPECT_EQ(1, listener.count());
|
| @@ -187,8 +189,9 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
| // Drag divider to the top, beyond first child minimum size.
|
| gfx::Point drag_2_point(
|
| 7, kMinimumChildSize - 5);
|
| - ui::MouseEvent mouse_dragged_2(ui::ET_MOUSE_DRAGGED, drag_2_point,
|
| - drag_2_point, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_dragged_2(
|
| + ui::ET_MOUSE_DRAGGED, drag_2_point, drag_2_point, ui::EventTimeForNow(),
|
| + 0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ASSERT_TRUE(split.OnMouseDragged(mouse_dragged_2));
|
| EXPECT_EQ(kMinimumChildSize, split.divider_offset());
|
| EXPECT_EQ(2, listener.count());
|
| @@ -196,8 +199,9 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
| // Drag divider to the bottom, beyond second child minimum size.
|
| gfx::Point drag_3_point(
|
| 7, kTotalSplitSize - kMinimumChildSize + 5);
|
| - ui::MouseEvent mouse_dragged_3(ui::ET_MOUSE_DRAGGED, drag_3_point,
|
| - drag_3_point, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_dragged_3(
|
| + ui::ET_MOUSE_DRAGGED, drag_3_point, drag_3_point, ui::EventTimeForNow(),
|
| + 0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ASSERT_TRUE(split.OnMouseDragged(mouse_dragged_3));
|
| EXPECT_EQ(kTotalSplitSize - kMinimumChildSize - split.GetDividerSize(),
|
| split.divider_offset());
|
| @@ -206,8 +210,9 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
| // Drag divider between childs' minimum sizes.
|
| gfx::Point drag_4_point(
|
| 6, kInitialDividerOffset + kMouseOffset + kMouseMoveDelta * 2);
|
| - ui::MouseEvent mouse_dragged_4(ui::ET_MOUSE_DRAGGED, drag_4_point,
|
| - drag_4_point, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_dragged_4(
|
| + ui::ET_MOUSE_DRAGGED, drag_4_point, drag_4_point, ui::EventTimeForNow(),
|
| + 0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| ASSERT_TRUE(split.OnMouseDragged(mouse_dragged_4));
|
| EXPECT_EQ(kInitialDividerOffset + kMouseMoveDelta * 2,
|
| split.divider_offset());
|
| @@ -215,8 +220,10 @@ TEST(SingleSplitViewTest, MouseDrag) {
|
|
|
| gfx::Point release_point(
|
| 7, kInitialDividerOffset + kMouseOffset + kMouseMoveDelta * 2);
|
| - ui::MouseEvent mouse_released(ui::ET_MOUSE_RELEASED, release_point,
|
| - release_point, ui::EventTimeForNow(), 0, 0);
|
| + ui::MouseEvent mouse_released(
|
| + ui::ET_MOUSE_RELEASED, release_point, release_point,
|
| + ui::EventTimeForNow(), 0, 0,
|
| + ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| split.OnMouseReleased(mouse_released);
|
| EXPECT_EQ(kInitialDividerOffset + kMouseMoveDelta * 2,
|
| split.divider_offset());
|
|
|