ash/desktop_background/desktop_background_view.cc - Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell.

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/desktop_background/desktop_background_view.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 6 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 | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/frame/custom_frame_view_ash_unittest.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/desktop_background_view.cc

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc

index 1b05745655c80117156cb510b2f4d147984e2f6e..a8d7bb1462e817587302b9639c7c8b539bf69068 100644

--- a/ash/desktop_background/desktop_background_view.cc

+++ b/ash/desktop_background/desktop_background_view.cc

@@ -233,7 +233,7 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,

// 4. From an empty background, guest user logged in.

if (wallpaper_delegate->ShouldShowInitialAnimation() ||

root_window_controller->animating_wallpaper_controller() ||

- Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) {

+ WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers()) {

::wm::SetWindowVisibilityAnimationTransition(

desktop_widget->GetNativeView(), ::wm::ANIMATE_SHOW);

int duration_override = wallpaper_delegate->GetAnimationDurationOverride();