chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf

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 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments Created 4 years, 4 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/first_run/steps/tray_step.cc ('k') | chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.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 15c7bd9c345cebea877404833fcdde3f4d1d281e..4818e069abe1660f443b9eb19cd8e2b66d013223 100644

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

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

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

#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"

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

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

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/shell.h"

#include "base/rand_util.h"

@@ -375,7 +376,7 @@ void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(

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

ash::Shell::GetInstance()->

desktop_background_controller()->MoveDesktopToLockedContainer();

- ash::Shelf::ForPrimaryDisplay()->SetAlignment(

+ ash::Shelf::ForPrimaryDisplay()->wm_shelf()->SetAlignment(

ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);

controller_->SetManagerProfile(manager_profile);