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

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1688 matching lines @@
   View* root_view = widget->GetRootView();
 
   EventCountView* v1 = new EventCountView();
   v1->SetBounds(0, 0, 10, 10);
   root_view->AddChildView(v1);
   EventCountView* v2 = new EventCountView();
   v2->SetBounds(0, 10, 10, 10);
   root_view->AddChildView(v2);
 
   gfx::Point cursor_location(5, 5);
-  ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
-                      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent move(
+      ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   widget->OnMouseEvent(&move);
 
   EXPECT_EQ(1, v1->GetEventCount(ui::ET_MOUSE_ENTERED));
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_ENTERED));
 
   delete v1;
   v2->SetBounds(0, 0, 10, 10);
   EXPECT_EQ(0, v2->GetEventCount(ui::ET_MOUSE_ENTERED));
 
   widget->SynthesizeMouseMoveEvent();
@@ skipping 415 matching lines @@
   View* view = new RootViewTestView();
   view->SetBounds(0, 0, 300, 300);
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget->GetRootView());
   root_view->AddChildView(view);
 
   // Check RootView::mouse_pressed_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetMousePressedHandler(root_view));
   gfx::Point click_location(45, 15);
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, click_location, click_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent press(
+      ui::ET_MOUSE_PRESSED, click_location, click_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   widget->OnMouseEvent(&press);
   EXPECT_EQ(view, GetMousePressedHandler(root_view));
   widget->Hide();
   EXPECT_EQ(NULL, GetMousePressedHandler(root_view));
 
   // Check RootView::mouse_move_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetMouseMoveHandler(root_view));
   gfx::Point move_location(45, 15);
-  ui::MouseEvent move(ui::ET_MOUSE_MOVED, move_location, move_location,
-                      ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move(
+      ui::ET_MOUSE_MOVED, move_location, move_location, ui::EventTimeForNow(),
+      0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   widget->OnMouseEvent(&move);
   EXPECT_EQ(view, GetMouseMoveHandler(root_view));
   widget->Hide();
   EXPECT_EQ(NULL, GetMouseMoveHandler(root_view));
 
   // Check RootView::gesture_handler_.
   widget->Show();
   EXPECT_EQ(NULL, GetGestureHandler(root_view));
   ui::GestureEvent tap_down(15,
                             15,
@@ skipping 1071 matching lines @@
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(true);
   EXPECT_TRUE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(false);
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views