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

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 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 "ash/wm/workspace_controller.h"
 
 #include <map>
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 1460 matching lines @@
   };
   // Do two iterations, first without any transform on |second|, and the second
   // time after applying some transform on |second| so that it doesn't get
   // targeted.
   for (int times = 0; times < 2; ++times) {
     SCOPED_TRACE(times == 0 ? "Without transform" : "With transform");
     aura::Window* expected_target = times == 0 ? second.get() : first.get();
     for (int i = 0; i < kNumPoints; ++i) {
       SCOPED_TRACE(points[i].direction);
       const gfx::Point& location = points[i].location;
-      ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,
-                           ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+      ui::MouseEvent mouse(
+          ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),
+          ui::EF_NONE, ui::EF_NONE,
+          ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
       EXPECT_EQ(expected_target, target);
 
       ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, location, 0,
                            ui::EventTimeForNow());
       target = targeter->FindTargetForEvent(root, &touch);
       EXPECT_EQ(expected_target, target);
     }
     // Apply a transform on |second|. After the transform is applied, the window
     // should no longer be targeted.
@@ skipping 19 matching lines @@
   } points[kNumPoints] = {
     { "left", gfx::Point(bounds.x() - 2, bounds.y() + 10), true },
     { "top", gfx::Point(bounds.x() + 10, bounds.y() - 2), true },
     { "right", gfx::Point(bounds.right() + 2, bounds.y() + 10), true },
     { "bottom", gfx::Point(bounds.x() + 10, bounds.bottom() + 2), true },
     { "outside", gfx::Point(bounds.x() + 10, bounds.y() - 31), false },
   };
   for (int i = 0; i < kNumPoints; ++i) {
     SCOPED_TRACE(points[i].direction);
     const gfx::Point& location = points[i].location;
-    ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,
-                         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+    ui::MouseEvent mouse(
+        ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),
+        ui::EF_NONE, ui::EF_NONE,
+        ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
   }
 }
 
 // Verifies touch event targeting just outside the window edges for panels.
 // The shelf is aligned to the bottom by default, and so touches just below
@@ skipping 55 matching lines @@
   } points[kNumPoints] = {
     { "left", gfx::Point(bounds.x() - 2, bounds.y() + 10), true },
     { "top", gfx::Point(bounds.x() + 10, bounds.y() - 2), true },
     { "right", gfx::Point(bounds.right() + 2, bounds.y() + 10), true },
     { "bottom", gfx::Point(bounds.x() + 10, bounds.bottom() + 2), true },
     { "outside", gfx::Point(bounds.x() + 10, bounds.y() - 31), false },
   };
   for (int i = 0; i < kNumPoints; ++i) {
     SCOPED_TRACE(points[i].direction);
     const gfx::Point& location = points[i].location;
-    ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,
-                         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+    ui::MouseEvent mouse(
+        ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),
+        ui::EF_NONE, ui::EF_NONE,
+        ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
 
     ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, location, 0,
                          ui::EventTimeForNow());
     target = targeter->FindTargetForEvent(root, &touch);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
   }
 }
 
 }  // namespace ash