Index: chrome/browser/chromeos/login/user_manager_impl.cc |
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc |
index b73d1c5e0e77db76db233339df96c60db305a51b..073c99e7b10ed4a8f625144bf0f8f7ae1a159f48 100644 |
--- a/chrome/browser/chromeos/login/user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc |
@@ -361,10 +361,21 @@ void UserManagerImpl::StubUserLoggedIn() { |
kStubDefaultImageIndex); |
} |
-void UserManagerImpl::SetLoggedInUserWallpaper() { |
+void UserManagerImpl::InitializeWallpaper() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- if (!IsUserLoggedIn() || IsLoggedInAsStub()) { |
+ if (!IsUserLoggedIn()) { |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) { |
+ bool show_users; |
Daniel Erat
2012/06/11 16:06:06
initialize this to false or true. you're ignoring
bshe
2012/06/11 17:04:15
Agree.
We should probably also add a DCHECK here?
Daniel Erat
2012/06/11 17:12:10
DCHECK sounds fine, but make sure you do:
bool
|
+ CrosSettings::Get()->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, |
+ &show_users); |
+ if (!show_users) { |
+ ash::Shell::GetInstance()->desktop_background_controller()-> |
+ SetDefaultWallpaper(ash::GetSolidColorIndex()); |
+ } |
+ } |
+ return; |
+ } else if (IsLoggedInAsStub()) { |
ash::Shell::GetInstance()->desktop_background_controller()-> |
SetDefaultWallpaper(ash::GetInvalidWallpaperIndex()); |
return; |
@@ -1020,8 +1031,9 @@ void UserManagerImpl::GetLoggedInUserWallpaperProperties( |
User::WallpaperType* type, |
int* index) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(logged_in_user_); |
- if (!IsUserLoggedIn() || IsLoggedInAsStub()) { |
+ if (IsLoggedInAsStub()) { |
*type = current_user_wallpaper_type_ = User::DEFAULT; |
*index = current_user_wallpaper_index_ = ash::GetInvalidWallpaperIndex(); |
return; |