Some cleanup of WallpaperManager.

chrome/browser/chromeos/login/wallpaper_manager.h

Index: chrome/browser/chromeos/login/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h
index 203e35f7c5789acdc4d9ca6bb756cbd43418a3a8..607d1971a2e2dbe7289501a8da40318844720ae4 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/wallpaper_manager.h
@@ -189,19 +189,12 @@ class WallpaperManager: public content::NotificationObserver {
   // wallpaper of logged in user.
   void EnsureLoggedInUserWallpaperLoaded();
 
-  // Clears disposable ONLINE and CUSTOM wallpaper cache. At multi profile
-  // world, logged in users' wallpaper cache is not disposable.
-  void ClearDisposableWallpaperCache();
-
   // Returns custom wallpaper path. Append |sub_dir|, |user_id_hash| and |file|
   // to custom wallpaper directory.
   base::FilePath GetCustomWallpaperPath(const char* sub_dir,
                                         const std::string& user_id_hash,
                                         const std::string& file) const;
 
-  // Returns filepath to save original custom wallpaper for the given user.
-  base::FilePath GetOriginalWallpaperPathForUser(const std::string& user_id);
-
   // Gets wallpaper information of logged in user.
   bool GetLoggedInUserWallpaperInfo(WallpaperInfo* info);
 
@@ -252,20 +245,12 @@ class WallpaperManager: public content::NotificationObserver {
   // Sets wallpaper to default wallpaper (asynchronously with default delay).
   void SetDefaultWallpaperDelayed(const std::string& user_id);
 
-  // Initialize wallpaper for the specified user to default and saves this
-  // settings in local state.
-  void InitInitialUserWallpaper(const std::string& user_id,
-                                bool is_persistent);
-
   // Sets selected wallpaper information for |user_id| and saves it to Local
   // State if |is_persistent| is true.
   void SetUserWallpaperInfo(const std::string& user_id,
                             const WallpaperInfo& info,
                             bool is_persistent);
 
-  // Sets last selected user on user pod row.
-  void SetLastSelectedUser(const std::string& last_selected_user);
-
   // Sets |user_id|'s wallpaper (asynchronously with zero delay).
   void SetUserWallpaperNow(const std::string& user_id);
 
@@ -312,6 +297,11 @@ class WallpaperManager: public content::NotificationObserver {
 
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
+  // Initialize wallpaper for the specified user to default and saves this
+  // settings in local state.
+  void InitInitialUserWallpaper(const std::string& user_id,
+                                bool is_persistent);
+
   // Set |wallpaper| controlled by policy.
   void SetPolicyControlledWallpaper(const std::string& user_id,
                                     const UserImage& wallpaper);
@@ -338,14 +328,19 @@ class WallpaperManager: public content::NotificationObserver {
   // Caches |user_id|'s wallpaper to memory.
   void CacheUserWallpaper(const std::string& user_id);
 
+  // Clears disposable ONLINE and CUSTOM wallpaper cache. At multi profile
+  // world, logged in users' wallpaper cache is not disposable.
+  void ClearDisposableWallpaperCache();
+
   // Clears all obsolete wallpaper prefs from old version wallpaper pickers.
   void ClearObsoleteWallpaperPrefs();
 
   // Deletes everything else except |path| in the same directory.
-  void DeleteAllExcept(const base::FilePath& path);
+  static void DeleteAllExcept(const base::FilePath& path);
 
   // Deletes a list of wallpaper files in |file_list|.
-  void DeleteWallpaperInList(const std::vector<base::FilePath>& file_list);
+  static void DeleteWallpaperInList(
+      const std::vector<base::FilePath>& file_list);
 
   // Deletes all |user_id| related custom wallpapers and directories.
   void DeleteUserWallpapers(const std::string& user_id,
@@ -353,7 +348,7 @@ class WallpaperManager: public content::NotificationObserver {
 
   // Creates all new custom wallpaper directories for |user_id_hash| if not
   // exist.
-  void EnsureCustomWallpaperDirectories(const std::string& user_id_hash);
+  static void EnsureCustomWallpaperDirectories(const std::string& user_id_hash);
 
   // Gets the CommandLine representing the current process's command line.
   base::CommandLine* GetComandLine();
@@ -407,15 +402,6 @@ class WallpaperManager: public content::NotificationObserver {
                           MovableOnDestroyCallbackHolder on_finish,
                           const UserImage& wallpaper);
 
-  // Generates thumbnail of custom wallpaper on wallpaper sequenced worker
-  // thread. If |persistent| is true, saves original custom image and resized
-  // images to disk.
-  void ProcessCustomWallpaper(const std::string& user_id_hash,
-                              bool persistent,
-                              const WallpaperInfo& info,
-                              scoped_ptr<gfx::ImageSkia> image,
-                              const UserImage::RawImage& raw_image);
-
   // Record data for User Metrics Analysis.
   void RecordUma(User::WallpaperType type, int index) const;
 
@@ -424,7 +410,7 @@ class WallpaperManager: public content::NotificationObserver {
   void SaveCustomWallpaper(const std::string& user_id_hash,
                            const base::FilePath& path,
                            ash::WallpaperLayout layout,
-                           const UserImage& wallpaper);
+                           const UserImage& wallpaper) const;
 
   // Saves wallpaper image raw |data| to |path| (absolute path) in file system.
   void SaveWallpaperInternal(const base::FilePath& path, const char* data,
@@ -449,7 +435,7 @@ class WallpaperManager: public content::NotificationObserver {
   // After completed load operation, update average load time.
   void SaveLastLoadTime(const base::TimeDelta elapsed);
 
-  // Notify all registed observers.
+  // Notify all registered observers.
   void NotifyAnimationFinished();
 
   // Returns modifiable PendingWallpaper.