Using random wallpaper until user select one

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 307 matching lines @@
   if (is_current_user_ephemeral_)
     delete logged_in_user_;
 }
 
 const UserList& UserManagerImpl::GetUsers() const {
   const_cast<UserManagerImpl*>(this)->EnsureUsersLoaded();
   return users_;
 }
 
 void UserManagerImpl::UserLoggedIn(const std::string& email) {
+  // Get a random wallpaper each time a user logged in.
+  current_user_wallpaper_index_ = ash::GetDefaultWallpaperIndex();
+
   // Remove the stub user if it is still around.
   if (logged_in_user_) {
     DCHECK(IsLoggedInAsStub());
     delete logged_in_user_;
     logged_in_user_ = NULL;
     is_current_user_ephemeral_ = false;
   }
 
   if (email == kGuestUser) {
     GuestUserLoggedIn();
@@ skipping 77 matching lines @@
 void UserManagerImpl::DemoUserLoggedIn() {
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
   logged_in_user_ = new User(kDemoUser, false);
   SetInitialUserImage(kDemoUser);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::GuestUserLoggedIn() {
   is_current_user_ephemeral_ = true;
+  // Guest user always uses the same wallpaper.
+  current_user_wallpaper_index_ = ash::GetGuestWallpaperIndex();
   logged_in_user_ = new User(kGuestUser, true);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) {
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
   logged_in_user_ = CreateUser(email);
   SetInitialUserImage(email);
   NotifyOnLogin();
@@ skipping 479 matching lines @@
 
 void UserManagerImpl::SetInitialUserImage(const std::string& username) {
   // Choose a random default image.
   int image_id = base::RandInt(0, kDefaultImagesCount - 1);
   SaveUserDefaultImageIndex(username, image_id);
 }
 
 int UserManagerImpl::GetUserWallpaperIndex() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // If at login screen or logged in as a guest/incognito user, then use the
-  // randomly generated wallpaper.
-  if (IsLoggedInAsGuest() || !IsUserLoggedIn())
+  // If at login screen, use the default guest wallpaper.
+  if (!IsUserLoggedIn())
     return ash::GetGuestWallpaperIndex();
+  // If logged in as other ephemeral users (Demo/Stub/Normal user with
+  // ephemeral policy enabled/Guest), use the index in memory.
+  if (IsCurrentUserEphemeral())
+    return current_user_wallpaper_index_;
 
   const chromeos::User& user = GetLoggedInUser();
   std::string username = user.email();
   DCHECK(!username.empty());
 
   PrefService* local_state = g_browser_process->local_state();
   const DictionaryValue* user_wallpapers =
       local_state->GetDictionary(UserManager::kUserWallpapers);
-  int index = ash::GetDefaultWallpaperIndex();
+  int index;
   if (!user_wallpapers->GetIntegerWithoutPathExpansion(username, &index))
-    SaveUserWallpaperIndex(index);
+    index = current_user_wallpaper_index_;
 
   DCHECK(index >=0 && index < ash::GetWallpaperCount());
   return index;
 }
 
 void UserManagerImpl::SaveUserWallpaperIndex(int wallpaper_index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // If at login screen or logged in as a guest/incognito user, then return.
-  // Guest/incognito user can not change wallpaper according to chromium-os
-  // issue 26900.
-  if (IsLoggedInAsGuest() || !IsUserLoggedIn())
+
+  current_user_wallpaper_index_ = wallpaper_index;
+  // Ephemeral users can not save data to local state. We just cache the index
+  // in memory for them.
+  if (IsCurrentUserEphemeral() || !IsUserLoggedIn()) {
     return;
+  }
 
   const chromeos::User& user = GetLoggedInUser();
   std::string username = user.email();
   DCHECK(!username.empty());
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate wallpapers_update(local_state,
                                          UserManager::kUserWallpapers);
   wallpapers_update->SetWithoutPathExpansion(username,
       new base::FundamentalValue(wallpaper_index));
@@ skipping 285 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos