ash/root_window_controller.cc - Issue 1116313002: Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode

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/root_window_controller.cc

Issue 1116313002: Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index bbe421095178c7f93464bb427abbf2e3d0b28f40..3b8fd90cf73ee5c2ebeee536a71149c2cfdfd139 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -960,13 +960,7 @@ void RootWindowController::CreateContainersInRootWindow(

"LockScreenContainer",

lock_screen_containers);

wm::SetSnapsChildrenToPhysicalPixelBoundary(lock_container);

- if (base::CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kAshDisableLockLayoutManager)) {

- lock_container->SetLayoutManager(

- new WorkspaceLayoutManager(lock_container));

- } else {

- lock_container->SetLayoutManager(new LockLayoutManager(lock_container));

- }

+ lock_container->SetLayoutManager(new LockLayoutManager(lock_container));

SetUsesScreenCoordinates(lock_container);

// TODO(beng): stopsevents

« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »