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

ui/views/touchui/touch_selection_controller_impl_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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/test_cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 714 matching lines @@
   ui::EventTargeter* targeter = root->GetEventTargeter();
 
   // Create the first window containing a Views::Textfield.
   CreateTextfield();
   aura::Window* window1 = textfield_widget_->GetNativeView();
 
   // Start touch editing, check that the handle is above the first window, and
   // end touch editing.
   StartTouchEditing();
   gfx::Point test_point = GetCursorHandleDragPoint();
-  ui::MouseEvent test_event1(ui::ET_MOUSE_MOVED, test_point, test_point,
-                             ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent test_event1(
+      ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+      ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_EQ(GetCursorHandleNativeView(),
             targeter->FindTargetForEvent(root, &test_event1));
   EndTouchEditing();
 
   // Create the second (empty) window over the first one.
   CreateWidget();
   aura::Window* window2 = widget_->GetNativeView();
 
   // Start touch editing (in the first window) and check that the handle is not
   // above the second window.
   StartTouchEditing();
-  ui::MouseEvent test_event2(ui::ET_MOUSE_MOVED, test_point, test_point,
-                             ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent test_event2(
+      ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+      ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_EQ(window2, targeter->FindTargetForEvent(root, &test_event2));
 
   // Move the first window to top and check that the handle is kept above the
   // first window.
   window1->GetRootWindow()->StackChildAtTop(window1);
-  ui::MouseEvent test_event3(ui::ET_MOUSE_MOVED, test_point, test_point,
-                             ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent test_event3(
+      ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+      ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_EQ(GetCursorHandleNativeView(),
             targeter->FindTargetForEvent(root, &test_event3));
 }
 
 TEST_F(TouchSelectionControllerImplTest, MouseEventDeactivatesTouchSelection) {
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
   ui::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
@@ skipping 44 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views