ash/desktop_background/desktop_background_view.cc - Issue 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access

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 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More windows breakages addressed Created 7 years, 7 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/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 6d6e487aacd4bb79297c7be075ac7c041c06fa4d..f851789b9d800fb27ebe1333cc5ff595f0e1ee2b 100644

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

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

@@ -201,7 +201,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window,

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

if (wallpaper_delegate->ShouldShowInitialAnimation() ||

root_window->GetProperty(kAnimatingDesktopController) ||

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

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

views::corewm::SetWindowVisibilityAnimationTransition(

desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW);

} else {

« no previous file with comments | « ash/ash_strings.grd ('k') | ash/root_window_controller.cc » ('j') | ash/session_state_delegate.h » ('J')