Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Unified Diff: ash/wm/root_window_event_filter_unittest.cc

Issue 9513004: Switch default WM mode to managed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/workspace/workspace_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/root_window_event_filter_unittest.cc
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index c4e41bdaada1c79be21c21ee3033782be775c5f0..94ff9f7d7144ebb6615f503ae16d5cb3f8cd4531 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -351,6 +351,9 @@ TEST_F(RootWindowEventFilterTest, ActivateOnTouch) {
TEST_F(RootWindowEventFilterTest, MouseEventCursors) {
aura::RootWindow* root_window = Shell::GetRootWindow();
+ // Disable ash grid so that test can place a window at
+ // specific location.
+ ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
// Create a window.
const int kWindowLeft = 123;
@@ -414,6 +417,10 @@ TEST_F(RootWindowEventFilterTest, MouseEventCursors) {
}
TEST_F(RootWindowEventFilterTest, TransformActivate) {
+ // Disable ash grid so that test can place a window at
+ // specific location.
+ ash::Shell::GetInstance()->DisableWorkspaceGridLayout();
+
aura::RootWindow* root_window = Shell::GetRootWindow();
gfx::Size size = root_window->GetHostSize();
EXPECT_EQ(gfx::Rect(size),
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/workspace/workspace_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698