summaryrefslogtreecommitdiffstats
path: root/ash/system/chromeos/rotation
diff options
context:
space:
mode:
authornhiroki <nhiroki@chromium.org>2014-09-14 18:49:39 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-15 01:51:50 +0000
commitbedd69525d5dd70a953f7a8a49089de0d66fe148 (patch)
tree93798cbe0fdadaef1a16e19142a8c99109a09b80 /ash/system/chromeos/rotation
parenta9e9f87c058a47db6c5709b38aae09acd56b11cc (diff)
downloadchromium_src-bedd69525d5dd70a953f7a8a49089de0d66fe148.zip
chromium_src-bedd69525d5dd70a953f7a8a49089de0d66fe148.tar.gz
chromium_src-bedd69525d5dd70a953f7a8a49089de0d66fe148.tar.bz2
Revert of Clean up GestureEventDetails constructors (patchset #4 id:100001 of https://codereview.chromium.org/565583005/)
Reason for revert: This seems to fail the following tests in "athena_unittests" on "Linux ChromiumOS Tests (dbg)(3)" - HomeCardGestureManagerTest.Basic - HomeCardGestureManagerTest.StartCentered http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%283%29/builds/36778 Original issue's description: > Clean up GestureEventDetails' constructors. > > In one of the GestureEventDetails' constructors, the arguments > delta_x, delta_y sometime are not used, so we should make a new > constructor which only takes one argument EventType. > > BUG=350942 > > Committed: https://crrev.com/b5e408e7bffd3d1e6b60612f65c0538a90329c59 > Cr-Commit-Position: refs/heads/master@{#294760} TBR=tdresser@chromium.org,jdduke@chromium.org,sadrul@chromium.org,sky@chromium.org,lanwei@chromium.org NOTREECHECKS=true NOTRY=true BUG=350942 Review URL: https://codereview.chromium.org/572593002 Cr-Commit-Position: refs/heads/master@{#294776}
Diffstat (limited to 'ash/system/chromeos/rotation')
-rw-r--r--ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index 7a53f9d..dd6eb40 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));
+ ui::GestureEvent tap(0, 0, 0, base::TimeDelta(),
+ ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0.0f, 0.0f));
default_view()->OnGestureEvent(&tap);
EXPECT_TRUE(maximize_mode_controller->rotation_locked());
EXPECT_TRUE(tray_view()->visible());