ash/wm/workspace/workspace_layout_manager_unittest.cc - Issue 2823133002: Clean up some ash constants.

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 2823133002: Clean up some ash constants. (Closed)

Patch Set: updates Created 3 years, 8 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

« ash/shelf/shelf_view.cc ('K') | « ash/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 70c89b51c3c42d2a052bfe692cce96132e8b51cc..462f43283f9f4dfcadf52ea4dfc2d589775b6881 100644

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

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

@@ -220,9 +220,8 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

// is inside 2nd display.

window_state->Maximize();

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

- EXPECT_EQ(

- gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),

- window->GetBoundsInScreen().ToString());

+ EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),

+ window->GetBoundsInScreen().ToString());

window_state->Restore();

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

@@ -233,9 +232,8 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

window_state->SetRestoreBoundsInScreen(gfx::Rect(295, 0, 30, 40));

window_state->Maximize();

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

- EXPECT_EQ(

- gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),

- window->GetBoundsInScreen().ToString());

+ EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),

+ window->GetBoundsInScreen().ToString());

window_state->Restore();

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

@@ -254,9 +252,8 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {

EXPECT_TRUE(w1->IsMaximized());

EXPECT_EQ(root_windows[1],

WmWindow::Get(w1->GetNativeWindow())->GetRootWindow());

- EXPECT_EQ(

- gfx::Rect(300, 0, 400, 500 - GetShelfConstant(SHELF_SIZE)).ToString(),

- w1->GetWindowBoundsInScreen().ToString());

+ EXPECT_EQ(gfx::Rect(300, 0, 400, 500 - kShelfSize).ToString(),

+ w1->GetWindowBoundsInScreen().ToString());

w1->Restore();

EXPECT_EQ(root_windows[1],

WmWindow::Get(w1->GetNativeWindow())->GetRootWindow());