Deselect should maintain previously selected wallpaper and guest should load default guest wallpaper

chrome/browser/chromeos/login/wallpaper_manager.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/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 341 matching lines @@
   wallpaper_update->SetWithoutPathExpansion(username, wallpaper_properties);
 }
 
 void WallpaperManager::SetLastSelectedUser(
     const std::string& last_selected_user) {
   last_selected_user_ = last_selected_user;
 }
 
 void WallpaperManager::SetUserWallpaper(const std::string& email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (email == kGuestUser) {
+    ash::Shell::GetInstance()->desktop_background_controller()->
+      SetDefaultWallpaper(ash::GetGuestWallpaperIndex(), false);
+

[Nikita (slow), 2012/08/08 16:51:25]

nit: drop empty line.

+  }
+
   if (!UserManager::Get()->IsKnownUser(email))
     return;
 
   User::WallpaperType type;
   int index;
   base::Time date;
   GetUserWallpaperProperties(email, &type, &index, &date);
   if (type == User::DAILY && date != base::Time::Now().LocalMidnight()) {
     index = ash::GetNextWallpaperIndex(index);
     SaveUserWallpaperProperties(email, User::DAILY, index);
@@ skipping 15 matching lines @@
   SetLastSelectedUser(email);
 }
 
 void WallpaperManager::SetWallpaperFromImageSkia(
     const gfx::ImageSkia& wallpaper,
     ash::WallpaperLayout layout) {
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetCustomWallpaper(wallpaper, layout);
 }
 
-void WallpaperManager::OnUserDeselected() {
-  if (!UserManager::Get()->IsUserLoggedIn()) {
-    // This will set default login wallpaper (#fefefe).
-    ash::Shell::GetInstance()->desktop_background_controller()->
-        SetDefaultWallpaper(ash::GetSolidColorIndex(), false);
-  }
-}
-
 void WallpaperManager::OnUserSelected(const std::string& email) {
   SetUserWallpaper(email);
 }
 
 // WallpaperManager, private: --------------------------------------------------
 
 WallpaperManager::~WallpaperManager() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   system::TimezoneSettings::GetInstance()->RemoveObserver(this);
 }
@@ skipping 180 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos