Use default wallpaper at login screen when user choose a custom 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 381 matching lines @@
     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);
   } else if (type == User::CUSTOMIZED) {
-    gfx::ImageSkia custom_wallpaper;
-    if (GetCustomWallpaperFromCache(email, &custom_wallpaper)) {

[Ivan Korotkov, 2012/08/16 15:45:01]

Why is GetCustomWallpaperFromCache not needed anymore in case of a logged-in
user? Is this because we 

[bshe, 2012/08/16 22:32:49]

If we cache (load from file and decode it) the custom wallpaper at login screen,
the only difference from display it on screen is that we dont call OnPaint
function to paint it. My understanding is that the security concern is mostly
about the decoding process. So I removed the cache custom wallpaper in this Cl
as well. In that case, we never cache a custom wallpaper. So I removed
GetCustomWallpeperFromCache. 

On 2012/08/16 15:45:01, Ivan Korotkov wrote:

-      // In customized mode, we use index pref to save the user selected
-      // wallpaper layout. See function SaveWallpaperToLocalState().
-      ash::WallpaperLayout layout = static_cast<ash::WallpaperLayout>(index);
-      ash::Shell::GetInstance()->desktop_background_controller()->
-          SetCustomWallpaper(custom_wallpaper, layout);
+    if (!UserManager::Get()->IsUserLoggedIn()) {
+      index = ash::GetDefaultWallpaperIndex();

[Ivan Korotkov, 2012/08/16 15:45:01]

Please comment on the purpose of this.

[bshe, 2012/08/16 22:32:49]

Done

On 2012/08/16 15:45:01, Ivan Korotkov wrote:

     } else {
       FetchCustomWallpaper(email);
+      return;
     }
-    return;
   }
   ash::Shell::GetInstance()->desktop_background_controller()->
       SetDefaultWallpaper(index, false);
   SetLastSelectedUser(email);
 }
 
 void WallpaperManager::SetWallpaperFromImageSkia(
     const gfx::ImageSkia& wallpaper,
     ash::WallpaperLayout layout) {
   ash::Shell::GetInstance()->desktop_background_controller()->
@@ skipping 60 matching lines @@
     }
   }
 }
 
 void WallpaperManager::CacheUserWallpaper(const std::string& email) {
   User::WallpaperType type;
   int index;
   base::Time date;
   GetUserWallpaperProperties(email, &type, &index, &date);
   if (type == User::CUSTOMIZED) {
-    std::string wallpaper_path = GetWallpaperPathForUser(email, false).value();
-
-    // Uses WeakPtr here to make the request cancelable.
-    wallpaper_loader_->Start(wallpaper_path, 0,
-                             base::Bind(&WallpaperManager::CacheWallpaper,
-                                        weak_factory_.GetWeakPtr(), email));
+    ash::Shell::GetInstance()->desktop_background_controller()->
+        CacheDefaultWallpaper(ash::GetDefaultWallpaperIndex());
   } else {
     ash::Shell::GetInstance()->desktop_background_controller()->
         CacheDefaultWallpaper(index);
   }
 }
 
 void WallpaperManager::CacheWallpaper(const std::string& email,
                                       const UserImage& wallpaper) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(custom_wallpaper_cache_.find(email) == custom_wallpaper_cache_.end());
@@ skipping 141 matching lines @@
 
 void WallpaperManager::SystemResumed() {
   BatchUpdateWallpaper();
 }
 
 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
   RestartTimer();
 }
 
 }  // chromeos