chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 2293183002: ash: Remove ash::Shelf in favor of ash::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 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)

Patch Set: rebase again 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/ui/ash/launcher/chrome_launcher_controller.h » ('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 31185f160f98ba70e6d071e3e60e25dfd5adea29..1420f20fc530709974042a417b9707cf387ace1d 100644

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

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

@@ -4,8 +4,8 @@

#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/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/wallpaper/wallpaper_controller.h"

#include "base/rand_util.h"

@@ -375,8 +375,8 @@ 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::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer();

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

- ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED);

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

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

controller_->SetManagerProfile(manager_profile);

if (actor_)