| Index: ui/views/controls/button/custom_button_unittest.cc
|
| diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
|
| index de3be98fe5541c63730f7c00a7ab67cf52cfcee3..aaf02f60d4303cc184ec521a4bda6adca493027b 100644
|
| --- a/ui/views/controls/button/custom_button_unittest.cc
|
| +++ b/ui/views/controls/button/custom_button_unittest.cc
|
| @@ -99,12 +99,14 @@ 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);
|
| @@ -150,13 +152,15 @@ TEST_F(CustomButtonTest, NotifyAction) {
|
| // 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());
|
|
|
| @@ -165,7 +169,8 @@ TEST_F(CustomButtonTest, NotifyAction) {
|
| 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());
|
|
|
| @@ -173,7 +178,8 @@ TEST_F(CustomButtonTest, NotifyAction) {
|
| 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());
|
| }
|
|
|