summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_manager_unittest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-10 18:40:03 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-10 18:40:03 +0000
commit906a97f3b0ae98f7273061af7a8e8f1873ca7d2e (patch)
treed214846df0198c913b63212027c638bdb60d4e0b /ash/wm/window_manager_unittest.cc
parenta60ceaa6c27f93b573af590280cbee20fc59f4a8 (diff)
downloadchromium_src-906a97f3b0ae98f7273061af7a8e8f1873ca7d2e.zip
chromium_src-906a97f3b0ae98f7273061af7a8e8f1873ca7d2e.tar.gz
chromium_src-906a97f3b0ae98f7273061af7a8e8f1873ca7d2e.tar.bz2
Removes the grid from ash.
BUG=137338 TEST=covered by tests. R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10910164 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_manager_unittest.cc')
-rw-r--r--ash/wm/window_manager_unittest.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index b56356c..52d210a 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -366,9 +366,6 @@ TEST_F(WindowManagerTest, ActivateOnTouch) {
TEST_F(WindowManagerTest, MouseEventCursors) {
aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
- // Disable ash grid so that test can place a window at
- // specific location.
- ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
// Create a window.
const int kWindowLeft = 123;
@@ -466,10 +463,6 @@ TEST_F(WindowManagerTest, MouseEventCursors) {
#define MAYBE_TransformActivate TransformActivate
#endif
TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
- // Disable ash grid so that test can place a window at
- // specific location.
- ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
-
aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
gfx::Size size = root_window->bounds().size();
EXPECT_EQ(