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

ui/views/controls/button/custom_button_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/views/controls/button/custom_button.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
@@ skipping 81 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CustomButtonTest);
 };
 
 }  // namespace
 
 // Tests that hover state changes correctly when visiblity/enableness changes.
 TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   gfx::Point center(10, 10);
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_PRESSED, button()->state());
 
   button()->OnMouseReleased(ui::MouseEvent(
       ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
 
   button()->SetEnabled(false);
   EXPECT_EQ(CustomButton::STATE_DISABLED, button()->state());
 
   button()->SetEnabled(true);
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
 
   button()->SetVisible(false);
   EXPECT_EQ(CustomButton::STATE_NORMAL, button()->state());
@@ skipping 25 matching lines @@
 #endif  // !defined(OS_MACOSX) || defined(USE_AURA)
 }
 
 // Tests the different types of NotifyActions.
 TEST_F(CustomButtonTest, NotifyAction) {
   gfx::Point center(10, 10);
 
   // By default the button should notify its listener on mouse release.
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_PRESSED, button()->state());
   EXPECT_FALSE(button()->notified());
 
   button()->OnMouseReleased(ui::MouseEvent(
       ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
   EXPECT_TRUE(button()->notified());
 
   // Set the notify action to its listener on mouse press.
   button()->Reset();
   button()->set_notify_action(CustomButton::NOTIFY_ON_PRESS);
   button()->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_PRESSED, button()->state());
   EXPECT_TRUE(button()->notified());
 
   // The button should no longer notify on mouse release.
   button()->Reset();
   button()->OnMouseReleased(ui::MouseEvent(
       ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
   EXPECT_FALSE(button()->notified());
 }
 
 // No touch on desktop Mac. Tracked in http://crbug.com/445520.
 #if !defined(OS_MACOSX) || defined(USE_AURA)
 
 namespace {
 
 void PerformGesture(CustomButton* button, ui::EventType event_type) {
@@ skipping 47 matching lines @@
   EXPECT_FALSE(CustomButton::AsCustomButton(&label));
 
   Link link(text);
   EXPECT_FALSE(CustomButton::AsCustomButton(&link));
 
   Textfield textfield;
   EXPECT_FALSE(CustomButton::AsCustomButton(&textfield));
 }
 
 }  // namespace views