Some cleanup of WallpaperManager.

chrome/browser/chromeos/login/wallpaper_manager.h

 // Copyright (c) 2013 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 <deque>
 #include <string>
 #include <vector>
@@ skipping 171 matching lines @@
   // Registers wallpaper manager preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
   void AddObservers();
 
   // Loads wallpaper asynchronously if the current wallpaper is not the
   // 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);
 
   // Initializes wallpaper. If logged in, loads user's wallpaper. If not logged
   // in, uses a solid color wallpaper. If logged in as a stub user, uses an
   // empty wallpaper.
   void InitializeWallpaper();
 
   // NotificationObserver overrides:
   virtual void Observe(int type,
@@ skipping 30 matching lines @@
                           User::WallpaperType type,
                           const UserImage& wallpaper,
                           bool update_wallpaper);
 
   // Sets wallpaper to default wallpaper (asynchronously with zero delay).
   void SetDefaultWallpaperNow(const std::string& user_id);
 
   // 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);
 
   // Sets |user_id|'s wallpaper (asynchronously with default delay).
   void SetUserWallpaperDelayed(const std::string& user_id);
 
   // Sets wallpaper to |wallpaper| (asynchronously with zero delay). If
   // |update_wallpaper| is false, skip change wallpaper but only update cache.
   void SetWallpaperFromImageSkia(const std::string& user_id,
                                  const gfx::ImageSkia& wallpaper,
@@ skipping 26 matching lines @@
                        const std::string& user_id,
                        scoped_ptr<std::string> data);
 
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerPolicyTest;
 
   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);
 
   // Gets encoded wallpaper from cache. Returns true if success.
   bool GetWallpaperFromCache(const std::string& user_id,
                              gfx::ImageSkia* wallpaper);
 
   // The number of wallpapers have loaded. For test only.
   int loaded_wallpapers() const { return loaded_wallpapers_; }
 
   // Cache some (or 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 CacheUsersWallpapers();
 
   // 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,
                             const std::string& path_to_file);
 
   // 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();
 
   // Initialize wallpaper of registered device after device policy is trusted.
   // Note that before device is enrolled, it proceeds with untrusted setting.
   void InitializeRegisteredDeviceWallpaper();
 
   // Loads |user_id|'s wallpaper. When |update_wallpaper| is true, sets
   // wallpaper to the loaded wallpaper.
@@ skipping 33 matching lines @@
                             WallpaperInfo* info) const;
 
   // Sets wallpaper to the decoded wallpaper if |update_wallpaper| is true.
   // Otherwise, cache wallpaper to memory if not logged in.
   void OnWallpaperDecoded(const std::string& user_id,
                           ash::WallpaperLayout layout,
                           bool update_wallpaper,
                           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;
 
   // Saves original custom wallpaper to |path| (absolute path) on filesystem
   // and starts resizing operation of the custom wallpaper if necessary.
   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,
                              int size) const;
 
   // Creates new PendingWallpaper request (or updates currently pending).
   void ScheduleSetUserWallpaper(const std::string& user_id, bool delayed);
 
   // Sets wallpaper to default.
   void DoSetDefaultWallpaper(
       const std::string& user_id,
       MovableOnDestroyCallbackHolder on_finish);
 
   // Starts to load wallpaper at |wallpaper_path|. If |wallpaper_path| is the
   // same as |current_wallpaper_path_|, do nothing. Must be called on UI thread.
   void StartLoad(const std::string& user_id,
                  const WallpaperInfo& info,
                  bool update_wallpaper,
                  const base::FilePath& wallpaper_path,
                  MovableOnDestroyCallbackHolder on_finish);
 
   // 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.
   // Returns pending_inactive_ or creates new PendingWallpaper if necessary.
   PendingWallpaper* GetPendingWallpaper(const std::string& user_id,
                                         bool delayed);
 
   // Calculate delay for next wallpaper load.
   // It is usually average wallpaper load time.
   // If last wallpaper load happened long ago, timeout should be reduced by
@@ skipping 56 matching lines @@
   // All pending will be finally deleted on destroy.
   typedef std::vector<scoped_refptr<PendingWallpaper> > PendingList;
   PendingList loading_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_