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 395 matching lines @@
     }
     UMA_HISTOGRAM_ENUMERATION("UserImage.LoggedIn",
                               histogram_index,
                               kHistogramImagesCount);
   }
 }
 
 void UserManagerImpl::DemoUserLoggedIn() {
   is_current_user_new_ = true;
   is_current_user_ephemeral_ = true;
+  ephemeral_user_wallpaper_index_ = ash::GetDefaultWallpaperIndex();
   logged_in_user_ = new User(kDemoUser, false);
   SetInitialUserImage(kDemoUser);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::GuestUserLoggedIn() {
   is_current_user_ephemeral_ = true;
+  ephemeral_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;
+  ephemeral_user_wallpaper_index_ = ash::GetDefaultWallpaperIndex();
   logged_in_user_ = CreateUser(email);
   SetInitialUserImage(email);
   NotifyOnLogin();
 }
 
 void UserManagerImpl::StubUserLoggedIn() {
   is_current_user_ephemeral_ = true;
   logged_in_user_ = new User(kStubUser, false);
   logged_in_user_->SetImage(GetDefaultImage(kStubDefaultImageIndex),
                             kStubDefaultImageIndex);
@@ skipping 463 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 at login screen or logged in as a guest user, use the default guest
+  // wallpaper. If logged in as other ephemeral uses (Demo/Stub/Normal user
+  // with ephemeral policy enabled), use the index in memory.
   if (IsLoggedInAsGuest() || !IsUserLoggedIn())

[Nikita (slow), 2012/03/26 15:31:58]

if (!IsUserLoggedIn())

guest is handled below.

[bshe, 2012/03/26 16:12:10]

It seems we want to always return the same index for guest user. So I add this
conditions here. The ephemeral_user_wallpaper_index_ might change if guest user
try to set a wallpaper. Ideally, guest user shouldn't. We can get rid of the
guest user check after issue 26900 get fixed. But it might be safer to keep it
anyway.


On 2012/03/26 15:31:58, Nikita Kostylev wrote:

[Nikita (slow), 2012/03/26 16:50:07]

Ok, now I've checked that kGuestWallpaperIndex is fixed.

     return ash::GetGuestWallpaperIndex();
+  if (IsCurrentUserEphemeral())
+    return ephemeral_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();
   if (!user_wallpapers->GetIntegerWithoutPathExpansion(username, &index))
     SaveUserWallpaperIndex(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())
+  // Ephemeral users can not save data to local state. We cache the index in
+  // memory for them.
+  if (IsCurrentUserEphemeral() || !IsUserLoggedIn()) {
+    ephemeral_user_wallpaper_index_ = wallpaper_index;
     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