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

Unified Diff: ash/system/overview/overview_button_tray_unittest.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gesture recognizer tests Created 4 years, 7 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/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index 7a0cf1d72589e292328fbac3c8ce4282cb07730b..46a6d989751c50b82873fd226761d6f402925cdc 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -104,8 +104,8 @@ TEST_F(OverviewButtonTrayTest, PerformAction) {
// Overview Mode only works when there is a window
std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- ui::GestureEvent tap(
- 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
+ ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
+ ui::GestureEventDetails(ui::ET_GESTURE_TAP));
GetTray()->PerformAction(tap);
EXPECT_TRUE(Shell::GetInstance()->window_selector_controller()->
IsSelecting());
@@ -119,7 +119,7 @@ TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
// Tapping on the control when there are no windows (and thus the user cannot
// enter overview mode) should still record the action.
base::UserActionTester user_action_tester;
- ui::GestureEvent tap(0, 0, 0, base::TimeDelta(),
+ ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
ui::GestureEventDetails(ui::ET_GESTURE_TAP));
GetTray()->PerformAction(tap);
ASSERT_FALSE(
@@ -207,8 +207,8 @@ TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
// Overview Mode only works when there is a window
std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- ui::GestureEvent tap(
- 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
+ ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
+ ui::GestureEventDetails(ui::ET_GESTURE_TAP));
GetTray()->PerformAction(tap);
EXPECT_TRUE(
Shell::GetInstance()->window_selector_controller()->IsSelecting());

Powered by Google App Engine
This is Rietveld 408576698