Move all wallpaper file loading and decoding from DesktopBackgroundController to 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 153 matching lines @@
     base::Time started_load_at_;
 
     DISALLOW_COPY_AND_ASSIGN(PendingWallpaper);
   };
 
   static WallpaperManager* Get();
 
   WallpaperManager();
   virtual ~WallpaperManager();
 
-  void set_command_line_for_testing(base::CommandLine* command_line) {
-    command_line_for_testing_ = command_line;
-  }
+  void set_command_line_for_testing(base::CommandLine* command_line);
 
   // Indicates imminent shutdown, allowing the WallpaperManager to remove any
   // observers it has registered.
   void Shutdown();
 
   // Registers wallpaper manager preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Adds PowerManagerClient, TimeZoneSettings and CrosSettings observers.
   void AddObservers();
@@ skipping 30 matching lines @@
 
   // Removes all |user_id| related wallpaper info and saved wallpapers.
   void RemoveUserWallpaperInfo(const std::string& user_id);
 
   // Resizes |wallpaper| to a resolution which is nearest to |preferred_width|
   // and |preferred_height| while maintaining aspect ratio.
   bool ResizeWallpaper(const UserImage& wallpaper,
                        ash::WallpaperLayout layout,
                        int preferred_width,
                        int preferred_height,
-                       scoped_refptr<base::RefCountedBytes>* output) const;
+                       scoped_refptr<base::RefCountedBytes>* output,
+                       gfx::ImageSkia* output_skia) const;
 
   // Resizes |wallpaper| to a resolution which is nearest to |preferred_width|
   // and |preferred_height| while maintaining aspect ratio. And saves the
-  // resized wallpaper to |path|.
-  void ResizeAndSaveWallpaper(const UserImage& wallpaper,
+  // resized wallpaper to |path|. |result| is optional (may be NULL).
+  // Result is true on success.

[Daniel Erat, 2014/03/31 22:25:46]

nit: change to "Returns true on success."

[Alexander Alekseev, 2014/04/03 19:15:44]

Done.

+  bool ResizeAndSaveWallpaper(const UserImage& wallpaper,
                               const base::FilePath& path,
                               ash::WallpaperLayout layout,
                               int preferred_width,
-                              int preferred_height) const;
+                              int preferred_height,
+                              gfx::ImageSkia* result) const;
 
   // Saves custom wallpaper to file, post task to generate thumbnail and updates
   // local state preferences. If |update_wallpaper| is false, don't change
   // wallpaper but only update cache.
   void SetCustomWallpaper(const std::string& user_id,
                           const std::string& user_id_hash,
                           const std::string& file,
                           ash::WallpaperLayout layout,
                           User::WallpaperType type,
                           const UserImage& wallpaper,
@@ skipping 55 matching lines @@
   // Called when the policy-set wallpaper has been fetched.  Initiates decoding
   // of the JPEG |data| with a callback to SetPolicyControlledWallpaper().
   void OnPolicyFetched(const std::string& policy,
                        const std::string& user_id,
                        scoped_ptr<std::string> data);
 
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerPolicyTest;
+  friend class WallpaperManagerTest;
 
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
   // 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);
@@ skipping 98 matching lines @@
   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);
 
   // Saves wallpaper image raw |data| to |path| (absolute path) in file system.
-  void SaveWallpaperInternal(const base::FilePath& path, const char* data,
+  // True on success.
+  bool 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);
 
@@ skipping 16 matching lines @@
   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
   // the time passed after last wallpaper load. So usual user experience results
   // in zero delay.
   base::TimeDelta GetWallpaperLoadDelay() const;
 
+  // Init "*default_*_wallpaper_file_" from given command line.
+  void SetDefaultWallpaperPathFromCommandLine(base::CommandLine* command_line);

[Daniel Erat, 2014/03/31 22:25:46]

nit: s/Path/Paths/

[Alexander Alekseev, 2014/04/03 19:15:44]

Done.

+
+  // Sets wallpaper to decoded default.
+  void OnDefaultWallpaperDecoded(const base::FilePath& path,
+                                 scoped_ptr<gfx::ImageSkia>* result,
+                                 MovableOnDestroyCallbackHolder on_finish,
+                                 const UserImage& wallpaper);

[bshe, 2014/04/01 15:32:56]

nit: parameters that output result should appears after input. consider move
|wallpaper| above |result|.

[Alexander Alekseev, 2014/04/03 19:15:44]

OnDefaultWallpaperDecoded is used to create callback (wallpaper) binding 3 first
parameters. (The same as WallpaperManager::OnWallpaperDecoded). So the last
parameter must be wallpaper const reference.

+
+  // Start decoding given default wallpaper.
+  void StartLoadAndSetDefaultWallpaper(
+      const base::FilePath& path,
+      scoped_ptr<gfx::ImageSkia>* result,
+      MovableOnDestroyCallbackHolder on_finish);
+
   // The number of loaded wallpapers.
   int loaded_wallpapers_;
 
   // Sequence token associated with wallpaper operations.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 
   // Wallpaper sequenced task runner.
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // The file path of current loaded/loading custom/online wallpaper.
@@ skipping 36 matching lines @@
   // Pointer to last inactive (waiting) entry of 'loading_' list.
   // NULL when there is no inactive request.
   PendingWallpaper* pending_inactive_;
 
   // Owns PendingWallpaper.
   // PendingWallpaper deletes itself from here on load complete.
   // All pending will be finally deleted on destroy.
   typedef std::vector<scoped_refptr<PendingWallpaper> > PendingList;
   PendingList loading_;
 
+  base::FilePath default_small_wallpaper_file_;
+  base::FilePath default_large_wallpaper_file_;
+
+  base::FilePath guest_default_small_wallpaper_file_;

[Daniel Erat, 2014/03/31 22:25:46]

mind renaming these to "guest_small_wallpaper_file_" and
"guest_large_wallpaper_file_" so people will be less likely to confuse them with
the non-guest defaults?

[Alexander Alekseev, 2014/04/03 19:15:44]

Done.

+  base::FilePath guest_default_large_wallpaper_file_;
+
+  // Decoded default images are stored here.
+  scoped_ptr<gfx::ImageSkia> default_small_wallpaper_image_;

[Daniel Erat, 2014/03/31 22:25:46]

i'm pretty sure we don't want to hold all of these in memory. i believe that
DesktopBackgroundController only stored the currently-in-use image.

[bshe, 2014/04/01 15:32:56]

+1
On 2014/03/31 22:25:46, Daniel Erat wrote:

[Alexander Alekseev, 2014/04/03 19:15:44]

Done.

+  scoped_ptr<gfx::ImageSkia> default_large_wallpaper_image_;
+  scoped_ptr<gfx::ImageSkia> guest_default_small_wallpaper_image_;
+  scoped_ptr<gfx::ImageSkia> guest_default_large_wallpaper_image_;
+
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_