ash/wm/toplevel_layout_manager_unittest.cc - Issue 9689027: MonitorManager to manage multiple monitors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/toplevel_layout_manager_unittest.cc

Issue 9689027: MonitorManager to manage multiple monitors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: crash fix 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:

Index: ash/wm/toplevel_layout_manager_unittest.cc

diff --git a/ash/wm/toplevel_layout_manager_unittest.cc b/ash/wm/toplevel_layout_manager_unittest.cc

index 246c835885e4c2b1612893abb16a9d8fc826c0ee..e897333e9a905083a3284e551a35579c63e5b6ec 100644

--- a/ash/wm/toplevel_layout_manager_unittest.cc

+++ b/ash/wm/toplevel_layout_manager_unittest.cc

@@ -33,7 +33,7 @@ class ToplevelLayoutManagerTest : public test::AshTestBase {

virtual void SetUp() OVERRIDE {

test::AshTestBase::SetUp();

- Shell::GetRootWindow()->SetScreenWorkAreaInsets(

+ Shell::GetRootWindow()->SetMonitorWorkAreaInsets(

gfx::Insets(1, 2, 3, 4));

Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));

aura::Window* default_container = Shell::GetInstance()->GetContainer(

@@ -105,7 +105,7 @@ TEST_F(ToplevelLayoutManagerTest,

ResizeMaximizedWindowOnWorkAreaInsetsChange) {

gfx::Rect bounds(100, 100, 200, 200);

scoped_ptr<aura::Window> window(CreateTestWindow(bounds));

- Shell::GetRootWindow()->SetScreenWorkAreaInsets(

+ Shell::GetRootWindow()->SetMonitorWorkAreaInsets(

gfx::Insets(0, 0, 30, 0));

window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);

// Maximized window fills the work area.

@@ -113,7 +113,7 @@ TEST_F(ToplevelLayoutManagerTest,

window->bounds());

// Change work area insets.

- Shell::GetRootWindow()->SetScreenWorkAreaInsets(

+ Shell::GetRootWindow()->SetMonitorWorkAreaInsets(

gfx::Insets(0, 0, 60, 0));

// Maximized window fills the changed work area.

EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),