summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace_controller_unittest.cc
diff options
context:
space:
mode:
authorvarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 09:03:43 +0000
committervarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 09:03:43 +0000
commitb330a493656cc528d57ee45935b68dc78345a97a (patch)
tree4166196ccd830128c039451bb97f69e0ad0035f9 /ash/wm/workspace_controller_unittest.cc
parenta3b599fd931049507213b1265f80a46f5b46267b (diff)
downloadchromium_src-b330a493656cc528d57ee45935b68dc78345a97a.zip
chromium_src-b330a493656cc528d57ee45935b68dc78345a97a.tar.gz
chromium_src-b330a493656cc528d57ee45935b68dc78345a97a.tar.bz2
Fixes the shelf background while dragging a window
BUG=321704 TEST=ash_unittests --gtest_filter=*WorkspaceControllerTestDragging.DragWindowOverlapShelf* Review URL: https://codereview.chromium.org/102493004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller_unittest.cc')
-rw-r--r--ash/wm/workspace_controller_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index 72ee38b..dbf114e 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -1296,6 +1296,11 @@ TEST_P(WorkspaceControllerTestDragging, DragWindowOverlapShelf) {
Shell::GetPrimaryRootWindow(), gfx::Point());
generator.MoveMouseTo(10, 10);
generator.PressLeftButton();
+ generator.MoveMouseTo(100, shelf->GetIdealBounds().y() - 70);
+
+ // Shelf should not be in overlapped state.
+ EXPECT_FALSE(GetWindowOverlapsShelf());
+
generator.MoveMouseTo(100, shelf->GetIdealBounds().y() - 20);
// Shelf should detect overlap. Overlap state stays after mouse is released.