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

ui/views/controls/table/table_view_unittest.cc

 // Copyright (c) 2012 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/table/table_view.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
@@ skipping 180 matching lines @@
     columns[1].sortable = true;
     table_ = new TestTableView(model_.get(), columns);
     parent_.reset(table_->CreateParentIfNecessary());
     parent_->SetBounds(0, 0, 10000, 10000);
     parent_->Layout();
     helper_.reset(new TableViewTestHelper(table_));
   }
 
   void ClickOnRow(int row, int flags) {
     const int y = row * table_->row_height();
-    const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(0, y),
-                                 gfx::Point(0, y), ui::EventTimeForNow(),
-                                 ui::EF_LEFT_MOUSE_BUTTON | flags,
-                                 ui::EF_LEFT_MOUSE_BUTTON);
+    const ui::MouseEvent pressed(
+        ui::ET_MOUSE_PRESSED, gfx::Point(0, y), gfx::Point(0, y),
+        ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON | flags,
+        ui::EF_LEFT_MOUSE_BUTTON,
+        ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     table_->OnMousePressed(pressed);
   }
 
   void TapOnRow(int row) {
     const int y = row * table_->row_height();
     const ui::GestureEventDetails event_details(ui::ET_GESTURE_TAP);
     ui::GestureEvent tap(0, y, 0, base::TimeDelta(), event_details);
     table_->OnGestureEvent(&tap);
   }
 
@@ skipping 74 matching lines @@
   EXPECT_EQ(1, table_->visible_columns()[0].column.id);
   EXPECT_EQ(0, table_->visible_columns()[1].column.id);
   EXPECT_EQ("rows=0 4 cols=0 2", helper_->GetPaintRegion(table_->bounds()));
 }
 
 // Verifies resizing a column works.
 TEST_F(TableViewTest, Resize) {
   const int x = table_->visible_columns()[0].width;
   EXPECT_NE(0, x);
   // Drag the mouse 1 pixel to the left.
-  const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(x, 0),
-                               gfx::Point(x, 0), ui::EventTimeForNow(),
-                               ui::EF_LEFT_MOUSE_BUTTON,
-                               ui::EF_LEFT_MOUSE_BUTTON);
+  const ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, gfx::Point(x, 0), gfx::Point(x, 0),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   helper_->header()->OnMousePressed(pressed);
-  const ui::MouseEvent dragged(ui::ET_MOUSE_DRAGGED, gfx::Point(x - 1, 0),
-                               gfx::Point(x - 1, 0), ui::EventTimeForNow(),
-                               ui::EF_LEFT_MOUSE_BUTTON, 0);
+  const ui::MouseEvent dragged(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(x - 1, 0), gfx::Point(x - 1, 0),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   helper_->header()->OnMouseDragged(dragged);
 
   // This should shrink the first column and pull the second column in.
   EXPECT_EQ(x - 1, table_->visible_columns()[0].width);
   EXPECT_EQ(x - 1, table_->visible_columns()[1].x);
 }
 
 // Verifies resizing a column works with a gesture.
 TEST_F(TableViewTest, ResizeViaGesture) {
   const int x = table_->visible_columns()[0].width;
@@ skipping 70 matching lines @@
   EXPECT_EQ("3 1 2 0", GetModelToViewAsString(table_));
 }
 
 // Verfies clicking on the header sorts.
 TEST_F(TableViewTest, SortOnMouse) {
   EXPECT_TRUE(table_->sort_descriptors().empty());
 
   const int x = table_->visible_columns()[0].width / 2;
   EXPECT_NE(0, x);
   // Press and release the mouse.
-  const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(x, 0),
-                               gfx::Point(x, 0), ui::EventTimeForNow(),
-                               ui::EF_LEFT_MOUSE_BUTTON,
-                               ui::EF_LEFT_MOUSE_BUTTON);
+  const ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, gfx::Point(x, 0), gfx::Point(x, 0),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   // The header must return true, else it won't normally get the release.
   EXPECT_TRUE(helper_->header()->OnMousePressed(pressed));
-  const ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(x, 0),
-                               gfx::Point(x, 0), ui::EventTimeForNow(),
-                               ui::EF_LEFT_MOUSE_BUTTON,
-                               ui::EF_LEFT_MOUSE_BUTTON);
+  const ui::MouseEvent release(
+      ui::ET_MOUSE_RELEASED, gfx::Point(x, 0), gfx::Point(x, 0),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   helper_->header()->OnMouseReleased(release);
 
   ASSERT_EQ(1u, table_->sort_descriptors().size());
   EXPECT_EQ(0, table_->sort_descriptors()[0].column_id);
   EXPECT_TRUE(table_->sort_descriptors()[0].ascending);
 }
 
 namespace {
 
 class TableGrouperImpl : public TableGrouper {
@@ skipping 444 matching lines @@
   new_selection.AddIndexToSelection(0);
   new_selection.AddIndexToSelection(1);
   new_selection.set_active(0);
   new_selection.set_anchor(0);
   helper_->SetSelectionModel(new_selection);
   model_->RemoveRow(0);
   helper_->OnFocus();
 }
 
 }  // namespace views