Add PointerDetails to ui::MouseEvent's constructors

ui/aura/window_event_dispatcher_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/aura/window_event_dispatcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 108 matching lines @@
   const int kWindowHeight = 45;
   gfx::Rect bounds1(100, 200, kWindowWidth, kWindowHeight);
   gfx::Rect bounds2(300, 400, kWindowWidth, kWindowHeight);
   std::unique_ptr<aura::Window> window1(CreateTestWindowWithDelegate(
       delegate1.get(), -1234, bounds1, root_window()));
   std::unique_ptr<aura::Window> window2(CreateTestWindowWithDelegate(
       delegate2.get(), -5678, bounds2, root_window()));
 
   // Send a mouse event to window1.
   gfx::Point point(101, 201);
-  ui::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, point,
-                        ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                        ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent event1(
+      ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&event1);
 
   // Event was tested for non-client area for the target window.
   EXPECT_EQ(1, delegate1->non_client_count());
   EXPECT_EQ(0, delegate2->non_client_count());
   // The non-client component test was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->non_client_location());
   // Mouse event was received by target window.
   EXPECT_EQ(1, delegate1->mouse_event_count());
   EXPECT_EQ(0, delegate2->mouse_event_count());
   // Event was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->mouse_event_location());
   // Non-client flag was set.
   EXPECT_TRUE(delegate1->mouse_event_flags() & ui::EF_IS_NON_CLIENT);
 }
 
 TEST_P(WindowEventDispatcherTest, RepostEvent) {
   // Test RepostEvent in RootWindow. It only works for Mouse Press and touch
   // press.
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
   gfx::Point point(10, 10);
-  ui::MouseEvent event(ui::ET_MOUSE_PRESSED, point, point,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent event(
+      ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   host()->dispatcher()->RepostEvent(&event);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   ui::TouchEvent touch_pressed_event(
       ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), ui::EventTimeForNow(),
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
   host()->dispatcher()->RepostEvent(&touch_pressed_event);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(Env::GetInstance()->is_touch_down());
 }
 
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_P(WindowEventDispatcherTest, MouseButtonState) {
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
 
   gfx::Point location;
   std::unique_ptr<ui::MouseEvent> event;
 
   // Press the left button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Additionally press the right.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
-      ui::EF_RIGHT_MOUSE_BUTTON));
+      ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Release the left button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_RELEASED, location, location, ui::EventTimeForNow(),
-      ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Release the right button.  We should ignore the Shift-is-down flag.
-  event.reset(new ui::MouseEvent(ui::ET_MOUSE_RELEASED, location, location,
-                                 ui::EventTimeForNow(), ui::EF_SHIFT_DOWN,
-                                 ui::EF_RIGHT_MOUSE_BUTTON));
+  event.reset(new ui::MouseEvent(
+      ui::ET_MOUSE_RELEASED, location, location, ui::EventTimeForNow(),
+      ui::EF_SHIFT_DOWN, ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
 
   // Press the middle button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
-      ui::EF_MIDDLE_MOUSE_BUTTON, ui::EF_MIDDLE_MOUSE_BUTTON));
+      ui::EF_MIDDLE_MOUSE_BUTTON, ui::EF_MIDDLE_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 }
 
 TEST_P(WindowEventDispatcherTest, TranslatedEvent) {
   std::unique_ptr<Window> w1(test::CreateTestWindowWithDelegate(
       NULL, 1, gfx::Rect(50, 50, 100, 100), root_window()));
 
   gfx::Point origin(100, 100);
-  ui::MouseEvent root(ui::ET_MOUSE_PRESSED, origin, origin,
-                      ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent root(
+      ui::ET_MOUSE_PRESSED, origin, origin, ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   EXPECT_EQ("100,100", root.location().ToString());
   EXPECT_EQ("100,100", root.root_location().ToString());
 
   ui::MouseEvent translated_event(
       root, static_cast<Window*>(root_window()), w1.get(),
       ui::ET_MOUSE_ENTERED, root.flags());
   EXPECT_EQ("50,50", translated_event.location().ToString());
   EXPECT_EQ("100,100", translated_event.root_location().ToString());
 }
@@ skipping 409 matching lines @@
   // over |window| and verify |window| gets it (|window| gets it because it has
   // capture).
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
   EventFilterRecorder recorder;
   std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
   window->SetBounds(gfx::Rect(20, 20, 40, 30));
   window->AddPreTargetHandler(&recorder);
   window->SetCapture();
   const ui::MouseEvent press_event(
       ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   host()->dispatcher()->RepostEvent(&press_event);
   RunAllPendingInMessageLoop();  // Necessitated by RepostEvent().
   // Mouse moves/enters may be generated. We only care about a pressed.
   EXPECT_TRUE(EventTypesToString(recorder.events()).find("MOUSE_PRESSED") !=
               std::string::npos) << EventTypesToString(recorder.events());
 }
 
 TEST_P(WindowEventDispatcherTest, MouseMovesHeld) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
-  ui::MouseEvent mouse_move_event(ui::ET_MOUSE_MOVED, gfx::Point(0, 0),
-                                  gfx::Point(0, 0), ui::EventTimeForNow(), 0,
-                                  0);
+  ui::MouseEvent mouse_move_event(
+      ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_move_event);
   // Discard MOUSE_ENTER.
   recorder.Reset();
 
   host()->dispatcher()->HoldPointerMoves();
 
   // Check that we don't immediately dispatch the MOUSE_DRAGGED event.
-  ui::MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0),
-                                     gfx::Point(0, 0), ui::EventTimeForNow(), 0,
-                                     0);
+  ui::MouseEvent mouse_dragged_event(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   EXPECT_TRUE(recorder.events().empty());
 
   // Check that we do dispatch the held MOUSE_DRAGGED event before another type
   // of event.
-  ui::MouseEvent mouse_pressed_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                                     gfx::Point(0, 0), ui::EventTimeForNow(), 0,
-                                     0);
+  ui::MouseEvent mouse_pressed_event(
+      ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(recorder.events()));
   recorder.Reset();
 
   // Check that we coalesce held MOUSE_DRAGGED events. Note that here (and
   // elsewhere in this test) we re-define each event prior to dispatch so that
   // it has the correct state (phase, handled, target, etc.).
-  mouse_dragged_event =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
-  ui::MouseEvent mouse_dragged_event2(ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10),
-                                      gfx::Point(10, 10), ui::EventTimeForNow(),
-                                      0, 0);
+  mouse_dragged_event = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
+  ui::MouseEvent mouse_dragged_event2(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event2);
   EXPECT_TRUE(recorder.events().empty());
-  mouse_pressed_event =
-      ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
+  mouse_pressed_event = ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(recorder.events()));
   recorder.Reset();
 
   // Check that on ReleasePointerMoves, held events are not dispatched
   // immediately, but posted instead.
-  mouse_dragged_event =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
+  mouse_dragged_event = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   host()->dispatcher()->ReleasePointerMoves();
   EXPECT_TRUE(recorder.events().empty());
   RunAllPendingInMessageLoop();
   EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(recorder.events()));
   recorder.Reset();
 
   // However if another message comes in before the dispatch of the posted
   // event, check that the posted event is dispatched before this new event.
   host()->dispatcher()->HoldPointerMoves();
-  mouse_dragged_event =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
+  mouse_dragged_event = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   host()->dispatcher()->ReleasePointerMoves();
-  mouse_pressed_event =
-      ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
+  mouse_pressed_event = ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(recorder.events()));
   recorder.Reset();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(recorder.events().empty());
 
   // Check that if the other message is another MOUSE_DRAGGED, we still coalesce
   // them.
   host()->dispatcher()->HoldPointerMoves();
-  mouse_dragged_event =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
+  mouse_dragged_event = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   host()->dispatcher()->ReleasePointerMoves();
-  mouse_dragged_event2 =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10),
-                     gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
+  mouse_dragged_event2 = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event2);
   EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(recorder.events()));
   recorder.Reset();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(recorder.events().empty());
 
   // Check that synthetic mouse move event has a right location when issued
   // while holding pointer moves.
-  mouse_dragged_event =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
-                     ui::EventTimeForNow(), 0, 0);
-  mouse_dragged_event2 =
-      ui::MouseEvent(ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10),
-                     gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
-  ui::MouseEvent mouse_dragged_event3(ui::ET_MOUSE_DRAGGED, gfx::Point(28, 28),
-                                      gfx::Point(28, 28), ui::EventTimeForNow(),
-                                      0, 0);
+  mouse_dragged_event = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
+  mouse_dragged_event2 = ui::MouseEvent(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
+  ui::MouseEvent mouse_dragged_event3(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(28, 28), gfx::Point(28, 28),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   host()->dispatcher()->HoldPointerMoves();
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event);
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event2);
   window->SetBounds(gfx::Rect(15, 15, 80, 80));
   DispatchEventUsingWindowDispatcher(&mouse_dragged_event3);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(recorder.events().empty());
   host()->dispatcher()->ReleasePointerMoves();
   RunAllPendingInMessageLoop();
   EXPECT_EQ("MOUSE_MOVED", EventTypesToString(recorder.events()));
@@ skipping 75 matching lines @@
       &delegate, 1, gfx::Rect(20, 10, 10, 20), root_window()));
   window_first->Show();
   window_first->AddPreTargetHandler(&recorder_first);
 
   std::unique_ptr<aura::Window> window_second(CreateTestWindowWithDelegate(
       &delegate, 2, gfx::Rect(20, 30, 10, 20), root_window()));
   window_second->Show();
   window_second->AddPreTargetHandler(&recorder_second);
 
   const gfx::Point event_location(22, 33);
-  ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
-                       ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_MOVED, event_location, event_location, ui::EventTimeForNow(),
+      0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
 
   EXPECT_TRUE(recorder_first.events().empty());
   EXPECT_EQ("MOUSE_ENTERED MOUSE_MOVED",
             EventTypesToString(recorder_second.events()));
   ASSERT_EQ(2u, recorder_second.mouse_locations().size());
   EXPECT_EQ(gfx::Point(2, 3).ToString(),
             recorder_second.mouse_locations()[0].ToString());
 }
 
 // Tests that a mouse exit is dispatched to the last mouse location when
 // the window is hiddden.
 TEST_P(WindowEventDispatcherTest, DispatchMouseExitWhenHidingWindow) {
   EventFilterRecorder recorder;
 
   test::TestWindowDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(10, 10, 50, 50), root_window()));
   window->Show();
   window->AddPreTargetHandler(&recorder);
 
   // Dispatch a mouse move event into the window.
   const gfx::Point event_location(22, 33);
-  ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
-                       ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_MOVED, event_location, event_location, ui::EventTimeForNow(),
+      0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Hide the window and verify a mouse exit event's location.
   window->Hide();
   EXPECT_FALSE(recorder.events().empty());
   EXPECT_EQ("MOUSE_EXITED", EventTypesToString(recorder.events()));
   ASSERT_EQ(1u, recorder.mouse_locations().size());
   EXPECT_EQ(gfx::Point(12, 23).ToString(),
@@ skipping 117 matching lines @@
 
   test::TestWindowDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
   test::TestCursorClient cursor_client(root_window());
 
   // Dispatch a non-synthetic mouse event when mouse events are enabled.
-  ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse1(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse1);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Dispatch a synthetic mouse event when mouse events are enabled.
-  ui::MouseEvent mouse2(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(),
-                        ui::EF_IS_SYNTHESIZED, 0);
+  ui::MouseEvent mouse2(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), ui::EF_IS_SYNTHESIZED, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse2);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Dispatch a synthetic mouse event when mouse events are disabled.
   cursor_client.DisableMouseEvents();
   DispatchEventUsingWindowDispatcher(&mouse2);
   EXPECT_TRUE(recorder.events().empty());
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // Tests that a mouse-move event is not synthesized when a mouse-button is down.
 TEST_P(WindowEventDispatcherTest, DoNotSynthesizeWhileButtonDown) {
   EventFilterRecorder recorder;
   test::TestWindowDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
 
   window->AddPreTargetHandler(&recorder);
   // Dispatch a non-synthetic mouse event when mouse events are enabled.
-  ui::MouseEvent mouse1(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(),
-                        ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse1(
+      ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse1);
   ASSERT_EQ(1u, recorder.events().size());
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, recorder.events()[0]);
   window->RemovePreTargetHandler(&recorder);
   recorder.Reset();
 
   // Move |window| away from underneath the cursor.
   root_window()->AddPreTargetHandler(&recorder);
   window->SetBounds(gfx::Rect(30, 30, 100, 100));
   EXPECT_TRUE(recorder.events().empty());
@@ skipping 17 matching lines @@
   test::TestWindowDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
   EventFilterRecorder recorder;
   window->AddPreTargetHandler(&recorder);
 
   // Dispatch a non-synthetic mouse event to place cursor inside window bounds.
-  ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                       gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Update the window bounds so that cursor is now outside the window.
   // This should trigger a synthetic MOVED event.
   gfx::Rect bounds1(20, 20, 100, 100);
   window->SetBounds(bounds1);
   RunAllPendingInMessageLoop();
   ASSERT_FALSE(recorder.events().empty());
@@ skipping 33 matching lines @@
 
   test::TestWindowDelegate delegate;
   gfx::Point window_origin(7, 18);
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(window_origin, gfx::Size(100, 100)),
       root_window()));
   window->Show();
 
   // Dispatch a mouse move event into the window.
   gfx::Point mouse_location(gfx::Point(15, 25));
-  ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location, mouse_location,
-                        ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse1(
+      ui::ET_MOUSE_MOVED, mouse_location, mouse_location, ui::EventTimeForNow(),
+      0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_TRUE(recorder.events().empty());
   DispatchEventUsingWindowDispatcher(&mouse1);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Hide the cursor and verify a mouse exit was dispatched.
   host()->OnCursorVisibilityChanged(false);
   EXPECT_FALSE(recorder.events().empty());
   EXPECT_EQ("MOUSE_EXITED", EventTypesToString(recorder.events()));
 
@@ skipping 15 matching lines @@
 
   test::TestWindowDelegate delegate;
   gfx::Point window_origin(7, 18);
   std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(window_origin, gfx::Size(100, 100)),
       root_window()));
   window->Show();
 
   // Dispatch a mouse move event into the window.
   gfx::Point mouse_location(gfx::Point(15, 25));
-  ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location, mouse_location,
-                        ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse1(
+      ui::ET_MOUSE_MOVED, mouse_location, mouse_location, ui::EventTimeForNow(),
+      0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_TRUE(recorder.events().empty());
   DispatchEventUsingWindowDispatcher(&mouse1);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   test::TestCursorClient cursor_client(root_window());
   cursor_client.DisableMouseEvents();
 
   gfx::Point mouse_exit_location(gfx::Point(150, 150));
-  ui::MouseEvent mouse2(ui::ET_MOUSE_EXITED, gfx::Point(150, 150),
-                        gfx::Point(150, 150), ui::EventTimeForNow(),
-                        ui::EF_IS_SYNTHESIZED, 0);
+  ui::MouseEvent mouse2(
+      ui::ET_MOUSE_EXITED, gfx::Point(150, 150), gfx::Point(150, 150),
+      ui::EventTimeForNow(), ui::EF_IS_SYNTHESIZED, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse2);
 
   EXPECT_FALSE(recorder.events().empty());
   // We get the mouse exited event twice in our filter. Once during the
   // predispatch phase and during the actual dispatch.
   EXPECT_EQ("MOUSE_EXITED MOUSE_EXITED", EventTypesToString(recorder.events()));
 
   // Verify the mouse exit was dispatched at the correct location
   // (in the correct coordinate space).
   int translated_x = mouse_exit_location.x() - window_origin.x();
@@ skipping 443 matching lines @@
   w1->AddPreTargetHandler(&w1_filter);
   EventFilterRecorder w2_filter;
   w2->AddPreTargetHandler(&w2_filter);
 
   // Move mouse over window 2. This should generate a mouse-exited event for
   // window 1 resulting in deletion of window tree host and its event
   // dispatcher. The event dispatching should abort since the dispatcher is
   // destroyed. This test passes if no crash happens.
   // Here we can't use EventGenerator since it expects that the dispatcher is
   // not destroyed at the end of the dispatch.
-  ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, gfx::Point(20, 20),
-                            gfx::Point(20, 20), base::TimeTicks(), 0, 0);
+  ui::MouseEvent mouse_move(
+      ui::ET_MOUSE_MOVED, gfx::Point(20, 20), gfx::Point(20, 20),
+      base::TimeTicks(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::EventDispatchDetails details =
       host->dispatcher()->DispatchEvent(w2, &mouse_move);
   EXPECT_TRUE(details.dispatcher_destroyed);
 
   // Check events received by the two windows.
   EXPECT_EQ("MOUSE_EXITED", EventTypesToString(w1_filter.events()));
   EXPECT_EQ(std::string(), EventTypesToString(w2_filter.events()));
 }
 
 namespace {
@@ skipping 51 matching lines @@
       : root_(root),
         mouse_event_count_(0) {}
   ~DontResetHeldEventWindowDelegate() override {}
 
   int mouse_event_count() const { return mouse_event_count_; }
 
   // TestWindowDelegate:
   void OnMouseEvent(ui::MouseEvent* event) override {
     if ((event->flags() & ui::EF_SHIFT_DOWN) != 0 &&
         mouse_event_count_++ == 0) {
-      ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                                 gfx::Point(10, 10), ui::EventTimeForNow(),
-                                 ui::EF_SHIFT_DOWN, 0);
+      ui::MouseEvent mouse_event(
+          ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+          ui::EventTimeForNow(), ui::EF_SHIFT_DOWN, 0,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       root_->GetHost()->dispatcher()->RepostEvent(&mouse_event);
     }
   }
 
  private:
   Window* root_;
   int mouse_event_count_;
 
   DISALLOW_COPY_AND_ASSIGN(DontResetHeldEventWindowDelegate);
 };
 
 }  // namespace
 
 // Verifies RootWindow doesn't reset |RootWindow::held_repostable_event_| after
 // dispatching. This is done by using DontResetHeldEventWindowDelegate, which
 // tracks the number of events with ui::EF_SHIFT_DOWN set (all reposted events
 // have EF_SHIFT_DOWN). When the first event is seen RepostEvent() is used to
 // schedule another reposted event.
 TEST_P(WindowEventDispatcherTest, DontResetHeldEvent) {
   DontResetHeldEventWindowDelegate delegate(root_window());
   std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
   w1->SetBounds(gfx::Rect(0, 0, 40, 40));
-  ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                         gfx::Point(10, 10), ui::EventTimeForNow(),
-                         ui::EF_SHIFT_DOWN, 0);
+  ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), ui::EF_SHIFT_DOWN, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_window()->GetHost()->dispatcher()->RepostEvent(&pressed);
-  ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                          gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent pressed2(
+      ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   // Dispatch an event to flush event scheduled by way of RepostEvent().
   DispatchEventUsingWindowDispatcher(&pressed2);
   // Delegate should have seen reposted event (identified by way of
   // EF_SHIFT_DOWN). Dispatch another event to flush the second
   // RepostedEvent().
   EXPECT_EQ(1, delegate.mouse_event_count());
   DispatchEventUsingWindowDispatcher(&pressed2);
   EXPECT_EQ(2, delegate.mouse_event_count());
 }
 
@@ skipping 36 matching lines @@
 // we don't crash.
 TEST_P(WindowEventDispatcherTest, DeleteHostFromHeldMouseEvent) {
   // Should be deleted by |delegate|.
   WindowTreeHost* h2 = WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100));
   h2->InitHost();
   h2->window()->Show();
   DeleteHostFromHeldMouseEventDelegate delegate(h2);
   // Owned by |h2|.
   Window* w1 = CreateNormalWindow(1, h2->window(), &delegate);
   w1->SetBounds(gfx::Rect(0, 0, 40, 40));
-  ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                         gfx::Point(10, 10), ui::EventTimeForNow(),
-                         ui::EF_SHIFT_DOWN, 0);
+  ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), ui::EF_SHIFT_DOWN, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   h2->dispatcher()->RepostEvent(&pressed);
   // RunAllPendingInMessageLoop() to make sure the |pressed| is run.
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(delegate.got_mouse_event());
   EXPECT_TRUE(delegate.got_destroy());
 }
 
 TEST_P(WindowEventDispatcherTest, WindowHideCancelsActiveTouches) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
@@ skipping 189 matching lines @@
   void RunTest() {
     // Reset any event the window may have received when bringing up the window
     // (e.g. mouse-move events if the mouse cursor is over the window).
     handler_.Reset();
 
     // Start a nested message-loop, post an event to be dispatched, and then
     // terminate the message-loop. When the message-loop unwinds and gets back,
     // the reposted event should not have fired.
     std::unique_ptr<ui::MouseEvent> mouse(new ui::MouseEvent(
         ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
-        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
     message_loop()->task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&WindowEventDispatcherTestWithMessageLoop::RepostEventHelper,
                    host()->dispatcher(), base::Passed(&mouse)));
     message_loop()->task_runner()->PostTask(
         FROM_HERE, message_loop()->QuitWhenIdleClosure());
 
     base::MessageLoop::ScopedNestableTaskAllower allow(message_loop());
     base::RunLoop loop;
     loop.Run();
@@ skipping 63 matching lines @@
   std::unique_ptr<aura::Window> child(test::CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(20, 20, 100, 100), root_window()));
   child->Show();
 
   ui::test::TestEventHandler handler_child;
   ui::test::TestEventHandler handler_root;
   root_window()->AddPreTargetHandler(&handler_root);
   child->AddPreTargetHandler(&handler_child);
 
   {
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(30, 30),
-                        gfx::Point(30, 30), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(30, 30), gfx::Point(30, 30),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     DispatchEventUsingWindowDispatcher(&move);
     EXPECT_EQ(0, handler_child.num_mouse_events());
     EXPECT_EQ(1, handler_root.num_mouse_events());
   }
 
   {
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(50, 50),
-                        gfx::Point(50, 50), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(50, 50), gfx::Point(50, 50),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     DispatchEventUsingWindowDispatcher(&move);
     // The child receives an ENTER, and a MOVED event.
     EXPECT_EQ(2, handler_child.num_mouse_events());
     // The root receives both the ENTER and the MOVED events dispatched to
     // |child|, as well as an EXIT event.
     EXPECT_EQ(3, handler_root.num_mouse_events());
   }
 
   child->RemovePreTargetHandler(&handler_child);
   root_window()->RemovePreTargetHandler(&handler_root);
@@ skipping 68 matching lines @@
 
 // Tests that if dispatching a 'held' event triggers a nested message loop, then
 // the events that are dispatched from the nested message loop are transformed
 // correctly.
 TEST_P(WindowEventDispatcherTestInHighDPI,
        EventsTransformedInRepostedEventTriggeredNestedLoop) {
   std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
   // Make sure the window is visible.
   RunAllPendingInMessageLoop();
 
-  ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
-                            gfx::Point(80, 80), ui::EventTimeForNow(),
-                            ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent mouse_move(
+      ui::ET_MOUSE_MOVED, gfx::Point(80, 80), gfx::Point(80, 80),
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   const base::Closure callback_on_right_click = base::Bind(
       base::IgnoreResult(&WindowEventDispatcherTestInHighDPI::DispatchEvent),
       base::Unretained(this), base::Unretained(&mouse_move));
   TriggerNestedLoopOnRightMousePress handler(callback_on_right_click);
   window->AddPreTargetHandler(&handler);
 
-  std::unique_ptr<ui::MouseEvent> mouse(
-      new ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                         gfx::Point(10, 10), ui::EventTimeForNow(),
-                         ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON));
+  std::unique_ptr<ui::MouseEvent> mouse(new ui::MouseEvent(
+      ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeForNow(), ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   host()->dispatcher()->RepostEvent(mouse.get());
   EXPECT_EQ(0, handler.num_mouse_events());
 
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   // The window should receive the mouse-press and the mouse-move events.
   EXPECT_EQ(2, handler.num_mouse_events());
   // The mouse-move event location should be transformed because of the DSF
   // before it reaches the window.
   EXPECT_EQ(gfx::Point(40, 40).ToString(),
@@ skipping 20 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SelfDestructDelegate);
 };
 
 TEST_P(WindowEventDispatcherTest, SynthesizedLocatedEvent) {
   ui::test::EventGenerator generator(root_window());
   generator.MoveMouseTo(10, 10);
   EXPECT_EQ("10,10",
             Env::GetInstance()->last_mouse_location().ToString());
 
   // Synthesized event should not update the mouse location.
-  ui::MouseEvent mouseev(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
-                         ui::EventTimeForNow(), ui::EF_IS_SYNTHESIZED, 0);
+  ui::MouseEvent mouseev(
+      ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
+      ui::EF_IS_SYNTHESIZED, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   generator.Dispatch(&mouseev);
   EXPECT_EQ("10,10",
             Env::GetInstance()->last_mouse_location().ToString());
 
   generator.MoveMouseTo(0, 0);
   EXPECT_EQ("0,0",
             Env::GetInstance()->last_mouse_location().ToString());
 
   // Make sure the location gets updated when a syntheiszed enter
   // event destroyed the window.
@@ skipping 73 matching lines @@
   explicit DispatchEventHandler(Window* target)
       : target_(target),
         dispatched_(false) {}
   ~DispatchEventHandler() override {}
 
   bool dispatched() const { return dispatched_; }
  private:
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* mouse) override {
     if (mouse->type() == ui::ET_MOUSE_MOVED) {
-      ui::MouseEvent move(ui::ET_MOUSE_MOVED, target_->bounds().CenterPoint(),
-                          target_->bounds().CenterPoint(),
-                          ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+      ui::MouseEvent move(
+          ui::ET_MOUSE_MOVED, target_->bounds().CenterPoint(),
+          target_->bounds().CenterPoint(), ui::EventTimeForNow(), ui::EF_NONE,
+          ui::EF_NONE,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       ui::EventDispatchDetails details =
           target_->GetHost()->dispatcher()->OnEventFromSource(&move);
       ASSERT_FALSE(details.dispatcher_destroyed);
       EXPECT_FALSE(details.target_destroyed);
       EXPECT_EQ(target_, move.target());
       dispatched_ = true;
     }
     ui::EventHandler::OnMouseEvent(mouse);
   }
 
@@ skipping 52 matching lines @@
   // when |second| receives an event.
   MoveWindowHandler move_window(first.get(), second_root);
   second->AddPreTargetHandler(&move_window);
 
   // Some sanity checks: |first| is inside |root_window()|'s tree.
   EXPECT_EQ(root_window(), first->GetRootWindow());
   // The two root windows are different.
   EXPECT_NE(root_window(), second_root);
 
   // Dispatch an event to |first|.
-  ui::MouseEvent move(ui::ET_MOUSE_MOVED, first->bounds().CenterPoint(),
-                      first->bounds().CenterPoint(), ui::EventTimeForNow(),
-                      ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent move(
+      ui::ET_MOUSE_MOVED, first->bounds().CenterPoint(),
+      first->bounds().CenterPoint(), ui::EventTimeForNow(), ui::EF_NONE,
+      ui::EF_NONE,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::EventDispatchDetails details =
       host()->dispatcher()->OnEventFromSource(&move);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(details.target_destroyed);
   EXPECT_EQ(first.get(), move.target());
   EXPECT_TRUE(dispatch_event.dispatched());
   EXPECT_EQ(second_root, first->GetRootWindow());
 
   first->RemovePreTargetHandler(&dispatch_event);
   second->RemovePreTargetHandler(&move_window);
@@ skipping 79 matching lines @@
   EXPECT_EQ(window_second.get(),
             client::GetCaptureWindow(root_window()));
 
   // Send an event to the first host. Make sure it goes to |window_second| in
   // |second_host| instead (since it has capture).
   EventFilterRecorder recorder_first;
   window_first->AddPreTargetHandler(&recorder_first);
   EventFilterRecorder recorder_second;
   window_second->AddPreTargetHandler(&recorder_second);
   const gfx::Point event_location(25, 15);
-  ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, event_location, event_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_PRESSED, event_location, event_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_TRUE(recorder_first.events().empty());
   ASSERT_EQ(1u, recorder_second.events().size());
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, recorder_second.events()[0]);
   EXPECT_EQ(event_location.ToString(),
             recorder_second.mouse_locations()[0].ToString());
 }
 
 class AsyncWindowDelegate : public test::TestWindowDelegate {
  public:
@@ skipping 136 matching lines @@
 
 // Tests that we correctly report the fraction of time without user input via
 // UMA.
 TEST_P(WindowEventDispatcherTest, FractionOfTimeWithoutUserInputRecorded) {
   const char* kHistogram = "Event.FractionOfTimeWithoutUserInput";
   base::HistogramTester tester;
 
   std::unique_ptr<aura::Window> window(
       test::CreateTestWindowWithId(1234, root_window()));
 
-  ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeStampFromSeconds(4), 0,
-                        0);
+  ui::MouseEvent mouse1(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeStampFromSeconds(4), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   // To flush the idle fraction reporter, we need to dispatch two events. The
   // first event causes us to record the previous active period, and the second
   // flushes the previous active period.
-  ui::MouseEvent mouse2(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeStampFromSeconds(16),
-                        0, 0);
+  ui::MouseEvent mouse2(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeStampFromSeconds(16), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
-  ui::MouseEvent mouse3(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeStampFromSeconds(30),
-                        0, 0);
+  ui::MouseEvent mouse3(
+      ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+      ui::EventTimeStampFromSeconds(30), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   DispatchEventUsingWindowDispatcher(&mouse1);
   DispatchEventUsingWindowDispatcher(&mouse2);
   DispatchEventUsingWindowDispatcher(&mouse3);
 
   tester.ExpectTotalCount(kHistogram, 1);
 }
 
 INSTANTIATE_TEST_CASE_P(/* no prefix */,
                         WindowEventDispatcherTest,
@@ skipping 42 matching lines @@
 
   // Enable fetching mouse location from mouse.
   test::EnvTestHelper().SetAlwaysUseLastMouseLocation(false);
   EXPECT_EQ(gfx::Point(0, 0),
             window_tree_client_impl()->GetCursorScreenPoint());
   EXPECT_EQ(gfx::Point(0, 0), Env::GetInstance()->last_mouse_location());
 
   // Dispatch an event to |mouse_location|. While dispatching the event
   // Env::last_mouse_location() should return |mouse_location|.
   const gfx::Point mouse_location(1, 2);
-  ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_EQ(1, last_event_location_delegate.mouse_event_count());
   EXPECT_EQ(mouse_location, last_event_location_delegate.last_mouse_location());
 
   // After dispatch the location should fallback to that of the
   // WindowTreeClient, which defaults to 0,0.
   EXPECT_EQ(gfx::Point(0, 0), Env::GetInstance()->last_mouse_location());
 }
 
 TEST_F(WindowEventDispatcherMusTest, UseDefaultTargeterToFindTarget) {
   LastEventLocationDelegate last_event_location_delegate1;
   std::unique_ptr<Window> child1(
       CreateTestWindowWithDelegate(&last_event_location_delegate1, 123,
                                    gfx::Rect(10, 10, 100, 100), root_window()));
   LastEventLocationDelegate last_event_location_delegate2;
   std::unique_ptr<Window> child2(
       CreateTestWindowWithDelegate(&last_event_location_delegate2, 124,
                                    gfx::Rect(20, 30, 100, 100), child1.get()));
 
   const gfx::Point mouse_location(30, 40);
-  ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_EQ(0, last_event_location_delegate1.mouse_event_count());
   EXPECT_EQ(1, last_event_location_delegate2.mouse_event_count());
   EXPECT_EQ(gfx::Point(), last_event_location_delegate1.last_mouse_location());
   EXPECT_EQ(mouse_location,
             last_event_location_delegate2.last_mouse_location());
 }
 
 TEST_F(WindowEventDispatcherMusTest, UseDefaultTargeterToFindTarget2) {
   LastEventLocationDelegate last_event_location_delegate1;
   std::unique_ptr<Window> child1(
       CreateTestWindowWithDelegate(&last_event_location_delegate1, 123,
                                    gfx::Rect(10, 10, 100, 100), root_window()));
   LastEventLocationDelegate last_event_location_delegate2;
   std::unique_ptr<Window> child2(
       CreateTestWindowWithDelegate(&last_event_location_delegate2, 124,
                                    gfx::Rect(20, 30, 100, 100), child1.get()));
 
   const gfx::Point mouse_location(15, 25);
-  ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_EQ(1, last_event_location_delegate1.mouse_event_count());
   EXPECT_EQ(0, last_event_location_delegate2.mouse_event_count());
   EXPECT_EQ(mouse_location,
             last_event_location_delegate1.last_mouse_location());
   EXPECT_EQ(gfx::Point(), last_event_location_delegate2.last_mouse_location());
 }
 
 class NestedLocationDelegate : public test::TestWindowDelegate {
  public:
@@ skipping 59 matching lines @@
 
   // Enable fetching mouse location from mouse.
   test::EnvTestHelper().SetAlwaysUseLastMouseLocation(false);
   EXPECT_EQ(gfx::Point(0, 0),
             window_tree_client_impl()->GetCursorScreenPoint());
   EXPECT_EQ(gfx::Point(0, 0), Env::GetInstance()->last_mouse_location());
 
   // Dispatch an event to |mouse_location|. While dispatching the event
   // Env::last_mouse_location() should return |mouse_location|.
   const gfx::Point mouse_location(1, 2);
-  ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent mouse(
+      ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_EQ(1, last_event_location_delegate.mouse_event_count());
   EXPECT_EQ(1, last_event_location_delegate.nested_message_loop_count());
   EXPECT_EQ(mouse_location, last_event_location_delegate.last_mouse_location());
 
   // After dispatch the location should fallback to that of the
   // WindowTreeClient, which defaults to 0,0.
   EXPECT_EQ(gfx::Point(0, 0), Env::GetInstance()->last_mouse_location());
 }
 
 }  // namespace aura