ui: events: Add a class to hold common touch and stylus properties

ui/views/controls/single_split_view_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/single_split_view.h"
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/single_split_view_listener.h"
@@ skipping 151 matching lines @@
 
   const int kTotalSplitSize = 100;
   split.SetBounds(0, 0, 10, kTotalSplitSize);
   const int kInitialDividerOffset = 33;
   const int kMouseOffset = 2;  // Mouse offset in the divider.
   const int kMouseMoveDelta = 7;
   split.set_divider_offset(kInitialDividerOffset);
   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());
 
   // 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());
 
   // 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());
 
   // 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());
   EXPECT_EQ(3, listener.count());
 
   // 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());
   EXPECT_EQ(4, listener.count());
 
   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());
 
   // Expect intial offset after a system/user gesture cancels the drag.
   // This shouldn't occur after mouse release, but it's sufficient for testing.
   split.OnMouseCaptureLost();
   EXPECT_EQ(kInitialDividerOffset, split.divider_offset());
   EXPECT_EQ(5, listener.count());
 }
 
 }  // namespace views