Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1025)

Unified Diff: ui/views/bubble/bubble_window_targeter_unittest.cc

Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address build problems, add accessor and unit tests. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/bubble/bubble_window_targeter_unittest.cc
diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc
index 103cc3d283199a9b267a3ee10c11b2a80f4a9e4e..77a12ea10a9eed0cbd64854ff0d5da4be1b8dcf7 100644
--- a/ui/views/bubble/bubble_window_targeter_unittest.cc
+++ b/ui/views/bubble/bubble_window_targeter_unittest.cc
@@ -93,16 +93,18 @@ TEST_F(BubbleWindowTargeterTest, HitTest) {
{
bubble_delegate()->set_margins(gfx::Insets());
- ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
- bubble_bounds.origin(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent move1(
+ ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
}
{
bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
- ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
- bubble_bounds.origin(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent move1(
+ ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_EQ(bubble_window, targeter->FindTargetForEvent(root, &move1));
}
@@ -110,9 +112,10 @@ TEST_F(BubbleWindowTargeterTest, HitTest) {
new BubbleWindowTargeter(bubble_delegate())));
{
bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
- ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
- bubble_bounds.origin(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent move1(
+ ui::ET_MOUSE_MOVED, bubble_bounds.origin(), bubble_bounds.origin(),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
}
}

Powered by Google App Engine
This is Rietveld 408576698