Add PointerDetails to ui::MouseEvent's constructors

ash/drag_drop/drag_drop_controller_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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/common/drag_drop/drag_image_view.h"
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 669 matching lines @@
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     generator.MoveMouseBy(0, 1);
 
     // We send a unexpected mouse move event. Note that we cannot use
     // EventGenerator since it implicitly turns these into mouse drag events.
     // The DragDropController should simply ignore these events.
     gfx::Point mouse_move_location = drag_view->bounds().CenterPoint();
-    ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, mouse_move_location,
-                              mouse_move_location, ui::EventTimeForNow(), 0, 0);
+    ui::MouseEvent mouse_move(
+        ui::ET_MOUSE_MOVED, mouse_move_location, mouse_move_location,
+        ui::EventTimeForNow(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()
                                            ->GetHost()
                                            ->event_sink()
                                            ->OnEventFromSource(&mouse_move);
     ASSERT_FALSE(details.dispatcher_destroyed);
   }
 
   generator.ReleaseLeftButton();
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
@@ skipping 250 matching lines @@
     drag_drop_controller_->StartDragAndDrop(
         data, window->GetRootWindow(), window, gfx::Point(5, 5),
         ui::DragDropTypes::DRAG_MOVE,
         ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
 
     DragImageWindowObserver observer;
     ASSERT_TRUE(GetDragImageWindow());
     GetDragImageWindow()->AddObserver(&observer);
 
     {
-      ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0),
-                       gfx::Point(200, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                       ui::EF_NONE);
+      ui::MouseEvent e(
+          ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0),
+          ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       drag_drop_controller_->DragUpdate(window, e);
     }
     {
-      ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0),
-                       gfx::Point(600, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                       ui::EF_NONE);
+      ui::MouseEvent e(
+          ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0),
+          ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       drag_drop_controller_->DragUpdate(window, e);
     }
 
     drag_drop_controller_->DragCancel();
     CompleteCancelAnimation();
 
     EXPECT_EQ("5,5", observer.window_location_on_destroying().ToString());
   }
 
   {
     std::unique_ptr<views::Widget> widget(CreateNewWidget());
     aura::Window* window = widget->GetNativeWindow();
     drag_drop_controller_->StartDragAndDrop(
         data, window->GetRootWindow(), window, gfx::Point(405, 405),
         ui::DragDropTypes::DRAG_MOVE,
         ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
     DragImageWindowObserver observer;
     ASSERT_TRUE(GetDragImageWindow());
     GetDragImageWindow()->AddObserver(&observer);
 
     {
-      ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0),
-                       gfx::Point(600, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                       ui::EF_NONE);
+      ui::MouseEvent e(
+          ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0),
+          ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       drag_drop_controller_->DragUpdate(window, e);
     }
     {
-      ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0),
-                       gfx::Point(200, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                       ui::EF_NONE);
+      ui::MouseEvent e(
+          ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0),
+          ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       drag_drop_controller_->DragUpdate(window, e);
     }
 
     drag_drop_controller_->DragCancel();
     CompleteCancelAnimation();
 
     EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
   }
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
@@ skipping 10 matching lines @@
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
   std::unique_ptr<views::Widget> widget(CreateNewWidget());
   aura::Window* window = widget->GetNativeWindow();
   drag_drop_controller_->StartDragAndDrop(
       data, window->GetRootWindow(), window, gfx::Point(5, 5),
       ui::DragDropTypes::DRAG_MOVE, ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
 
   // Start dragging.
-  ui::MouseEvent e1(ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0),
-                    gfx::Point(200, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                    ui::EF_NONE);
+  ui::MouseEvent e1(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(200, 0), gfx::Point(200, 0),
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   drag_drop_controller_->DragUpdate(window, e1);
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_TRUE(drag_drop_controller_->IsDragDropInProgress());
 
   // Drag onto the secondary display.
-  ui::MouseEvent e2(ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0),
-                    gfx::Point(600, 0), ui::EventTimeForNow(), ui::EF_NONE,
-                    ui::EF_NONE);
+  ui::MouseEvent e2(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(600, 0), gfx::Point(600, 0),
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   drag_drop_controller_->DragUpdate(window, e2);
   EXPECT_TRUE(drag_drop_controller_->IsDragDropInProgress());
 
   // Disconnect the secondary display.
   UpdateDisplay("800x600");
 
   // The drag is canceled.
   EXPECT_TRUE(drag_drop_controller_->drag_canceled_);
   EXPECT_FALSE(drag_drop_controller_->IsDragDropInProgress());
 }
@@ skipping 48 matching lines @@
             drag_drop_controller_->drag_string_);
   EXPECT_EQ(1, drag_view->num_drag_enters_);
   EXPECT_EQ(2, drag_view->num_drag_updates_);
   EXPECT_EQ(1, drag_view->num_drops_);
   EXPECT_EQ(0, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
 }  // namespace test
 }  // namespace ash