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

Unified Diff: ui/views/widget/root_view_unittest.cc

Issue 577833003: Revert of Clean up GestureEventDetails constructors and fix unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/root_view_unittest.cc
diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc
index f4836cd7e095d87ee30f8121efbfb755d55d9e9a..d13e6c99c5cb7ad3bdcb9f91098993df03c9cf05 100644
--- a/ui/views/widget/root_view_unittest.cc
+++ b/ui/views/widget/root_view_unittest.cc
@@ -206,11 +206,14 @@
5,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
- ui::GestureEvent end1(
- 5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end1(5,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end1);
EXPECT_FALSE(details.target_destroyed);
@@ -225,11 +228,14 @@
5,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
details = root_view->OnEventFromSource(&long_press2);
- ui::GestureEvent end2(
- 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end2(25,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end2);
EXPECT_FALSE(details.target_destroyed);
@@ -244,11 +250,14 @@
50,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
details = root_view->OnEventFromSource(&long_press3);
- ui::GestureEvent end3(
- 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end3(25,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end3);
EXPECT_FALSE(details.target_destroyed);
@@ -291,11 +300,14 @@
5,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
ui::EventDispatchDetails details = root_view->OnEventFromSource(&long_press1);
- ui::GestureEvent end1(
- 5, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end1(5,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end1);
EXPECT_FALSE(details.target_destroyed);
@@ -310,11 +322,14 @@
5,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
details = root_view->OnEventFromSource(&long_press2);
- ui::GestureEvent end2(
- 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end2(25,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end2);
EXPECT_FALSE(details.target_destroyed);
@@ -329,11 +344,14 @@
50,
0,
base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS));
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0));
details = root_view->OnEventFromSource(&long_press3);
- ui::GestureEvent end3(
- 25, 5, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_END));
+ ui::GestureEvent end3(25,
+ 5,
+ 0,
+ base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_END, 0, 0));
details = root_view->OnEventFromSource(&end3);
EXPECT_FALSE(details.target_destroyed);
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698