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 846790c4494d6121a3f6abf2e0addb14b5be54ce..d2deb7170fe6572ba3cc68a593aa9921e5484bbe 100644 |
--- a/chrome/browser/chromeos/login/user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc |
@@ -358,7 +358,7 @@ void UserManagerImpl::StubUserLoggedIn() { |
kStubDefaultImageIndex); |
} |
-void UserManagerImpl::SetLoggedInUserWallpaper() { |
+void UserManagerImpl::InitializeWallpaper() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
if (!IsUserLoggedIn() || IsLoggedInAsStub()) { |
Nikita (slow)
2012/06/07 09:40:28
https://chromiumcodereview.appspot.com/10541007/ h
bshe
2012/06/08 15:06:30
right. And only for GAIA login flow, we need to se
|
@@ -976,6 +976,13 @@ void UserManagerImpl::GetLoggedInUserWallpaperProperties( |
if (!IsUserLoggedIn() || IsLoggedInAsStub()) { |
*type = current_user_wallpaper_type_ = User::DEFAULT; |
*index = current_user_wallpaper_index_ = ash::GetInvalidWallpaperIndex(); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) { |
Nikita (slow)
2012/06/06 11:27:46
This should be moved to InitializeWallpaper() to m
bshe
2012/06/08 15:06:30
Right. Sorry I was in a hurry. I did check on my a
|
+ bool show_users; |
+ CrosSettings::Get()->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, |
+ &show_users); |
+ if (!show_users) |
+ *index = current_user_wallpaper_index_ = ash::GetSolidColorIndex(); |
+ } |
return; |
} |