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

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/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 702 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::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()->
         GetHost()->event_processor()->OnEventFromSource(&mouse_move);
     ASSERT_FALSE(details.dispatcher_destroyed);
   }
 
   generator.ReleaseLeftButton();
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
@@ skipping 263 matching lines @@
         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::PointerEventDetails(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::PointerEventDetails(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());
   }
 
   {
     scoped_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::PointerEventDetails(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::PointerEventDetails(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 43 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