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

Unified Diff: ash/wm/workspace/workspace_manager_unittest.cc

Issue 9699013: MonitorManager to manage multiple monitors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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
Index: ash/wm/workspace/workspace_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc
index 20fa70492090c60de5058f7f8b2a049fe7007a2b..6a10dcb14bca43feb34f1b9308719e0d4dc7d4f1 100644
--- a/ash/wm/workspace/workspace_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_manager_unittest.cc
@@ -174,8 +174,9 @@ TEST_F(WorkspaceManagerTest, ResizeMaximizedWindowOnWorkAreaInsetsChange) {
EXPECT_EQ(251, w1->bounds().height());
// Maximize the window.
- Shell::GetInstance()->SetScreenWorkAreaInsets(
- gfx::Insets(0, 0, 30, 0));
+ Shell::GetInstance()->SetMonitorWorkAreaInsets(
+ Shell::GetRootWindow(),
+ gfx::Insets(0, 0, 30, 0));
w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
// Should be 1 workspace, TYPE_MAXIMIZED with w1, fills the work area bounds.
@@ -187,8 +188,9 @@ TEST_F(WorkspaceManagerTest, ResizeMaximizedWindowOnWorkAreaInsetsChange) {
EXPECT_EQ(GetWorkAreaBounds().height(), w1->bounds().height());
// Change work area insets.
- Shell::GetInstance()->SetScreenWorkAreaInsets(
- gfx::Insets(0, 0, 60, 0));
+ Shell::GetInstance()->SetMonitorWorkAreaInsets(
+ Shell::GetRootWindow(),
+ gfx::Insets(0, 0, 60, 0));
// Should be 1 workspace, TYPE_MAXIMIZED with w1, fills the changed work
// area bounds.

Powered by Google App Engine
This is Rietveld 408576698