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

ui/app_list/views/apps_grid_view_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/app_list/views/apps_grid_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 137 matching lines @@
                                 const gfx::Point& from,
                                 const gfx::Point& to) {
     AppListItemView* view = GetItemViewForPoint(from);
     DCHECK(view);
 
     gfx::Point translated_from = gfx::PointAtOffsetFromOrigin(
         from - view->bounds().origin());
     gfx::Point translated_to = gfx::PointAtOffsetFromOrigin(
         to - view->bounds().origin());
 
-    ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED, translated_from, from,
-                                 ui::EventTimeForNow(), 0, 0);
+    ui::MouseEvent pressed_event(
+        ui::ET_MOUSE_PRESSED, translated_from, from, ui::EventTimeForNow(), 0,
+        0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     apps_grid_view_->InitiateDrag(view, pointer, pressed_event);
 
-    ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated_to, to,
-                              ui::EventTimeForNow(), 0, 0);
+    ui::MouseEvent drag_event(
+        ui::ET_MOUSE_DRAGGED, translated_to, to, ui::EventTimeForNow(), 0, 0,
+        ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     apps_grid_view_->UpdateDragFromItem(pointer, drag_event);
     return view;
   }
 
   void SimulateKeyPress(ui::KeyboardCode key_code) {
     ui::KeyEvent key_event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE);
     apps_grid_view_->OnKeyPressed(key_event);
   }
 
   scoped_ptr<AppListTestModel> model_;
@@ skipping 125 matching lines @@
   test_api_->LayoutToIdealBounds();
 
   // Adding a launcher item cancels the drag and respects the order.
   SimulateDrag(AppsGridView::MOUSE, from, to);
   EXPECT_TRUE(apps_grid_view_->has_dragged_view());
   model_->CreateAndAddItem("Extra");
   // No need to EndDrag explicitly - adding an item should do this.
   EXPECT_FALSE(apps_grid_view_->has_dragged_view());
   // Even though cancelled, mouse move events can still arrive via the item
   // view. Ensure that behaves sanely, and doesn't start a new drag.
-  ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, gfx::Point(1, 1),
-                            gfx::Point(2, 2), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent drag_event(
+      ui::ET_MOUSE_DRAGGED, gfx::Point(1, 1), gfx::Point(2, 2),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   apps_grid_view_->UpdateDragFromItem(AppsGridView::MOUSE, drag_event);
   EXPECT_FALSE(apps_grid_view_->has_dragged_view());
 
   EXPECT_EQ(std::string("Item 1,Item 2,Item 3,Extra"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemIntoFolder) {
   EnsureFoldersEnabled();
@@ skipping 123 matching lines @@
 
   // The grid now looks like | blank | folder |.
   EXPECT_EQ(NULL, GetItemViewForPoint(GetItemTileRectAt(0, 0).CenterPoint()));
   EXPECT_EQ(folder_view,
             GetItemViewForPoint(GetItemTileRectAt(0, 1).CenterPoint()));
 
   // Move onto the folder and end the drag.
   to = GetItemTileRectAt(0, 1).CenterPoint();
   gfx::Point translated_to =
       gfx::PointAtOffsetFromOrigin(to - dragged_view->bounds().origin());
-  ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated_to, to,
-                            ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent drag_event(
+      ui::ET_MOUSE_DRAGGED, translated_to, to, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   apps_grid_view_->UpdateDragFromItem(AppsGridView::MOUSE, drag_event);
   apps_grid_view_->EndDrag(false);
 
   // The item should not have moved into the folder.
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemReorder) {
@@ skipping 318 matching lines @@
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
   EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test
 }  // namespace app_list