chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash

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: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash (Closed)

Patch Set: rebase, fix conflict with sky Created 3 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/session/chrome_session_manager.cc ('k') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

index 75874be8c3cba2a4dcc0586635a30375c9ade322..0292ad604d8b5bfdf585fa6940720de84a126dbf 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

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

#include <utility>

-#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/wallpaper/wallpaper_controller.h"

#include "ash/common/wm_shell.h"

#include "base/memory/ptr_util.h"

@@ -369,8 +368,6 @@ void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(

// For manager user, move wallpaper to locked container so that windows

// created during the user image picker step are below it.

ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer();

- ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow())

- ->SetAlignment(ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);

controller_->SetManagerProfile(manager_profile);

if (actor_)