summaryrefslogtreecommitdiffstats
path: root/ash/system
diff options
context:
space:
mode:
authorlanwei <lanwei@chromium.org>2014-09-17 10:54:12 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-17 17:54:27 +0000
commit66e0c057b87824c6e6928f359fa56a8ee45ae6e2 (patch)
tree508d5ae0eb272e89870546463a4f20eab6a3bb09 /ash/system
parentbfb71fc03179ac0d88c6b6d188915cf0dd363071 (diff)
downloadchromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.zip
chromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.tar.gz
chromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.tar.bz2
Clean up GestureEventDetails constructors and fix unit tests.
A new version of Issue 565583005: Clean up GestureEventDetails constructors https://codereview.chromium.org/565583005/ BUG=350942 TBR=tdresser@chromium.org, jdduke@chromium.org, sadrul@chromium.org Committed: https://crrev.com/874611d5ab5b879648682c1ea41062bebc9c95e5 Cr-Commit-Position: refs/heads/master@{#295144} Review URL: https://codereview.chromium.org/573963005 Cr-Commit-Position: refs/heads/master@{#295296}
Diffstat (limited to 'ash/system')
-rw-r--r--ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc4
-rw-r--r--ash/system/overview/overview_button_tray_unittest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index dd6eb40..7a53f9d 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -209,8 +209,8 @@ TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
EnableMaximizeModeWindowManager(true);
ASSERT_FALSE(tray_view()->visible());
- ui::GestureEvent tap(0, 0, 0, base::TimeDelta(),
- ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0.0f, 0.0f));
+ ui::GestureEvent tap(
+ 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
default_view()->OnGestureEvent(&tap);
EXPECT_TRUE(maximize_mode_controller->rotation_locked());
EXPECT_TRUE(tray_view()->visible());
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index 2471533..27ff367 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -78,8 +78,8 @@ TEST_F(OverviewButtonTrayTest, PerformAction) {
// Overview Mode only works when there is a window
scoped_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, 0.0f, 0.0f));
+ ui::GestureEvent tap(
+ 0, 0, 0, base::TimeDelta(), ui::GestureEventDetails(ui::ET_GESTURE_TAP));
GetTray()->PerformAction(tap);
EXPECT_TRUE(Shell::GetInstance()->window_selector_controller()->
IsSelecting());