Revert 150726 - Preload default wallpaper.

chrome/browser/chromeos/login/wallpaper_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 
 #include <string>
 
 #include "ash/desktop_background/desktop_background_resources.h"
@@ skipping 27 matching lines @@
 
   WallpaperManager();
 
   // Registers wallpaper manager preferences.
   static void RegisterPrefs(PrefService* local_state);
 
   // Adds PowerManagerClient and TimeZoneSettings observers. It needs to be
   // added after PowerManagerClient initialized.
   void AddObservers();
 
+  // Caches |email|'s wallpaper to memory if it is custom wallpaper.
+  void CacheIfCustomWallpaper(const std::string& email);
+
   // Loads wallpaper asynchronously if the current wallpaper is not the
   // wallpaper of logged in user.
   void EnsureLoggedInUserWallpaperLoaded();
 
   // Fetches |email|'s wallpaper from local disk.
   void FetchCustomWallpaper(const std::string& email);
 
   // Gets encoded custom wallpaper from cache. Returns true if success.
   bool GetCustomWallpaperFromCache(const std::string& email,
                                    gfx::ImageSkia* wallpaper);
@@ skipping 66 matching lines @@
  private:
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
   virtual ~WallpaperManager();
 
   // Change the wallpapers for users who choose DAILY wallpaper type. Updates
   // current wallpaper if it changed. This function should be called at exactly
   // at 0am if chromeos device is on.
   void BatchUpdateWallpaper();
 
-  // Cache all logged in users' wallpapers to memory at login screen. It should
-  // not compete with first wallpaper loading when boot up/initialize login
-  // WebUI page.
-  // There are two ways the first wallpaper might be loaded:
-  // 1. Loaded on boot. Login WebUI waits for it.
-  // 2. When flag --disable-boot-animation is passed. Login WebUI is loaded
-  // right away and in 500ms after. Wallpaper started to load.
-  // For case 2, should_cache_wallpaper_ is used to indicate if we need to
-  // cache wallpapers on wallpaper animation finished. The cache operation
-  // should be only executed once.
-  void CacheAllUsersWallpapers();
-
-  // Caches |email|'s wallpaper to memory.
-  void CacheUserWallpaper(const std::string& email);
-
   // Caches the decoded wallpaper to memory.
   void CacheWallpaper(const std::string& email, const UserImage& wallpaper);
 
   // Generates a 128x80 thumbnail and caches it.
   void CacheThumbnail(const std::string& email,
                       const gfx::ImageSkia& wallpaper);
 
   // Sets wallpaper to the decoded wallpaper.
   void FetchWallpaper(const std::string& email,
                       ash::WallpaperLayout layout,
@@ skipping 46 matching lines @@
   int current_user_wallpaper_index_;
 
   // Caches custom wallpapers of users. Accessed only on UI thread.
   CustomWallpaperMap custom_wallpaper_cache_;
 
   CustomWallpaperMap custom_wallpaper_thumbnail_cache_;
 
   // The last selected user on user pod row.
   std::string last_selected_user_;
 
-  bool should_cache_wallpaper_;
-
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
 
   content::NotificationRegistrar registrar_;
 
   base::OneShotTimer<WallpaperManager> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_