diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 23:29:00 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 23:29:00 +0000 |
| commit | 4a8cb8e9d77d15b000eb20949cce4197a20ae43e (patch) | |
| tree | 97a9d6d6872fba71685c48cf619b4b1d36918af1 /ash/shelf | |
| parent | eabbfb19a4edd46aa81b03f9c695a6f70789b8bd (diff) | |
| download | chromium_src-4a8cb8e9d77d15b000eb20949cce4197a20ae43e.zip chromium_src-4a8cb8e9d77d15b000eb20949cce4197a20ae43e.tar.gz chromium_src-4a8cb8e9d77d15b000eb20949cce4197a20ae43e.tar.bz2 | |
ash: Stop hiding the shelf on user-action after it was shown using gesture drag.
This is effectively a revert of r184013 and r183849.
BUG=227057, 173295
Review URL: https://codereview.chromium.org/13674020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_layout_manager_unittest.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index db87cff..b3e7a77 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -950,26 +950,6 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_GestureDrag) { EXPECT_EQ(shelf_hidden.ToString(), GetShelfWidget()->GetWindowBoundsInScreen().ToString()); - // Swipe up yet again to show it. - end.set_y(start.y() + 100); - generator.GestureScrollSequence(end, start, - base::TimeDelta::FromMilliseconds(10), 1); - EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state()); - EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior()); - - // Tap on the shelf itself. This should not change anything. - generator.GestureTapAt(start); - EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state()); - EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior()); - - // Now, tap on the desktop region (above the shelf). This should hide the - // shelf. - gfx::Point tap = start + gfx::Vector2d(0, -90); - generator.GestureTapAt(tap); - EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state()); - EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state()); - EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior()); - // Make the window fullscreen. widget->SetFullscreen(true); gfx::Rect bounds_fullscreen = window->bounds(); |