From b330a493656cc528d57ee45935b68dc78345a97a Mon Sep 17 00:00:00 2001 From: "varkha@chromium.org" Date: Fri, 13 Dec 2013 09:03:43 +0000 Subject: 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 --- ash/wm/workspace_controller_unittest.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ash/wm/workspace_controller_unittest.cc') 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. -- cgit v1.1