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

Unified Diff: ui/views/touchui/touch_selection_controller_impl_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor Created 3 years, 9 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/touchui/touch_selection_controller_impl_unittest.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 47430626a666c53831d0835230780f7b4bda8c54..79b3e9d6ce61daf62f981cb9aac56242e71beb1e 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -808,8 +808,10 @@ TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
// end touch editing.
StartTouchEditing();
gfx::Point test_point = GetCursorHandleDragPoint();
- ui::MouseEvent test_event1(ui::ET_MOUSE_MOVED, test_point, test_point,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent test_event1(
+ ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+ ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_EQ(GetCursorHandleNativeView(),
targeter->FindTargetForEvent(root, &test_event1));
EndTouchEditing();
@@ -821,15 +823,19 @@ TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
// Start touch editing (in the first window) and check that the handle is not
// above the second window.
StartTouchEditing();
- ui::MouseEvent test_event2(ui::ET_MOUSE_MOVED, test_point, test_point,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent test_event2(
+ ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+ ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_EQ(window2, targeter->FindTargetForEvent(root, &test_event2));
// Move the first window to top and check that the handle is kept above the
// first window.
window1->GetRootWindow()->StackChildAtTop(window1);
- ui::MouseEvent test_event3(ui::ET_MOUSE_MOVED, test_point, test_point,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent test_event3(
+ ui::ET_MOUSE_MOVED, test_point, test_point, ui::EventTimeForNow(),
+ ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
EXPECT_EQ(GetCursorHandleNativeView(),
targeter->FindTargetForEvent(root, &test_event3));
}
@@ -895,8 +901,10 @@ TEST_F(TouchSelectionControllerImplTest, MouseCaptureChangedEventIgnored) {
// it does not deactivate touch selection.
StartTouchEditing();
EXPECT_TRUE(GetSelectionController());
- ui::MouseEvent capture_changed(ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(5, 5),
- gfx::Point(5, 5), base::TimeTicks(), 0, 0);
+ ui::MouseEvent capture_changed(
+ ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(5, 5), gfx::Point(5, 5),
+ base::TimeTicks(), 0, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
generator.Dispatch(&capture_changed);
RunPendingMessages();
EXPECT_TRUE(GetSelectionController());

Powered by Google App Engine
This is Rietveld 408576698