ash/wm/workspace/workspace_layout_manager_unittest.cc - Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

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/workspace/workspace_layout_manager_unittest.cc

Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 3 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/workspace/workspace_layout_manager_unittest.cc

diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc

index 13cfdea04a3548c6ecdfa785522dab8b65d8a843..5ec242f8a4c8bcafc9460916b9c4937da5613863 100644

--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc

+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc

@@ -138,7 +138,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

// is inside 2nd display.

wm::MaximizeWindow(window.get());

EXPECT_EQ(root_windows[1], window->GetRootWindow());

- EXPECT_EQ("300,0 400x452", window->GetBoundsInScreen().ToString());

+ EXPECT_EQ("300,0 400x453", window->GetBoundsInScreen().ToString());

wm::RestoreWindow(window.get());

EXPECT_EQ(root_windows[1], window->GetRootWindow());

@@ -149,7 +149,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

SetRestoreBoundsInScreen(window.get(), gfx::Rect(280, 0, 30, 40));

wm::MaximizeWindow(window.get());

EXPECT_EQ(root_windows[1], window->GetRootWindow());

- EXPECT_EQ("300,0 400x452", window->GetBoundsInScreen().ToString());

+ EXPECT_EQ("300,0 400x453", window->GetBoundsInScreen().ToString());

wm::RestoreWindow(window.get());

EXPECT_EQ(root_windows[1], window->GetRootWindow());

@@ -165,7 +165,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

w1->Show();

EXPECT_TRUE(w1->IsMaximized());

EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());

- EXPECT_EQ("300,0 400x452", w1->GetWindowBoundsInScreen().ToString());

+ EXPECT_EQ("300,0 400x453", w1->GetWindowBoundsInScreen().ToString());

w1->Restore();

EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());

EXPECT_EQ("400,0 30x40", w1->GetWindowBoundsInScreen().ToString());