ash/wm/workspace/workspace_layout_manager_unittest.cc - Issue 138003007: [Cleanup] Screen cleanup

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 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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 8f2569ff4cdf4dcbdf26c67db271751ca0f0fff7..41e067fefaa9af4e9524ca02be8ff2edec782e21 100644

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

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

@@ -7,7 +7,7 @@

#include "ash/display/display_layout.h"

#include "ash/display/display_manager.h"

#include "ash/root_window_controller.h"

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

@@ -108,7 +108,7 @@ TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {

UpdateDisplay("400x300,500x400");

window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100),

- ScreenAsh::GetSecondaryDisplay());

+ ScreenUtil::GetSecondaryDisplay());

EXPECT_EQ(Shell::GetAllRootWindows()[1], window->GetRootWindow());

window_state->Minimize();

// This will not be used for un-minimizing window.