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

Unified Diff: ash/drag_drop/drag_drop_tracker_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: ash/drag_drop/drag_drop_tracker_unittest.cc
diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc
index 621c0b6eab419819433564ddcdb853329a41d9e9..55fe1b9680135c27f039685d307d7356a2ab122b 100644
--- a/ash/drag_drop/drag_drop_tracker_unittest.cc
+++ b/ash/drag_drop/drag_drop_tracker_unittest.cc
@@ -33,8 +33,10 @@ class DragDropTrackerTest : public test::AshTestBase {
static aura::Window* GetTarget(const gfx::Point& location) {
std::unique_ptr<DragDropTracker> tracker(
new DragDropTracker(Shell::GetPrimaryRootWindow(), NULL));
- ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, location, location,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent e(
+ ui::ET_MOUSE_DRAGGED, location, location, ui::EventTimeForNow(),
+ ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
aura::Window* target = tracker->GetTarget(e);
return target;
}
@@ -129,9 +131,10 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// Start tracking from the RootWindow0 and converts the mouse event into
// |window0|'s coodinates.
- ui::MouseEvent original00(ui::ET_MOUSE_DRAGGED, gfx::Point(50, 50),
- gfx::Point(50, 50), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent original00(
+ ui::ET_MOUSE_DRAGGED, gfx::Point(50, 50), gfx::Point(50, 50),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
std::unique_ptr<ui::LocatedEvent> converted00(
ConvertEvent(window0.get(), original00));
EXPECT_EQ(original00.type(), converted00->type());
@@ -141,9 +144,10 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// Start tracking from the RootWindow0 and converts the mouse event into
// |window1|'s coodinates.
- ui::MouseEvent original01(ui::ET_MOUSE_DRAGGED, gfx::Point(350, 150),
- gfx::Point(350, 150), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent original01(
+ ui::ET_MOUSE_DRAGGED, gfx::Point(350, 150), gfx::Point(350, 150),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
std::unique_ptr<ui::LocatedEvent> converted01(
ConvertEvent(window1.get(), original01));
EXPECT_EQ(original01.type(), converted01->type());
@@ -157,9 +161,10 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// Start tracking from the RootWindow1 and converts the mouse event into
// |window0|'s coodinates.
- ui::MouseEvent original10(ui::ET_MOUSE_DRAGGED, gfx::Point(-150, 50),
- gfx::Point(-150, 50), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent original10(
+ ui::ET_MOUSE_DRAGGED, gfx::Point(-150, 50), gfx::Point(-150, 50),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
std::unique_ptr<ui::LocatedEvent> converted10(
ConvertEvent(window0.get(), original10));
EXPECT_EQ(original10.type(), converted10->type());
@@ -169,9 +174,10 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// Start tracking from the RootWindow1 and converts the mouse event into
// |window1|'s coodinates.
- ui::MouseEvent original11(ui::ET_MOUSE_DRAGGED, gfx::Point(150, 150),
- gfx::Point(150, 150), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent original11(
+ ui::ET_MOUSE_DRAGGED, gfx::Point(150, 150), gfx::Point(150, 150),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
std::unique_ptr<ui::LocatedEvent> converted11(
ConvertEvent(window1.get(), original11));
EXPECT_EQ(original11.type(), converted11->type());

Powered by Google App Engine
This is Rietveld 408576698