Apply default wallpaper from customization manifest.

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 72 matching lines @@
 
 // This class maintains wallpapers for users who have logged into this Chrome
 // OS device.
 class WallpaperManager: public content::NotificationObserver {
  public:
   enum WallpaperResolution {
     WALLPAPER_RESOLUTION_LARGE,
     WALLPAPER_RESOLUTION_SMALL
   };
 
+  struct CustomizedWallpaperRescaledFiles {

[Daniel Erat, 2014/04/14 15:26:15]

does this really need to be public?

[Alexander Alekseev, 2014/04/15 01:57:16]

Probably yes. Otherwize functions in anonymous namespace cannot use
it.

I've moved it to .cc file.

+    CustomizedWallpaperRescaledFiles(const base::FilePath& path_rescaled_small,
+                                     const base::FilePath& path_rescaled_large);
+
+    base::FilePath path_rescaled_small;
+    base::FilePath path_rescaled_large;
+  };
+
+  struct CustomizedWallpaperFilesExist {

[Daniel Erat, 2014/04/14 15:26:15]

this sounds more like a method name than a struct. this should probably be a
method on CustomizedWallpaperRescaledFiles, which should then be a class instead
of a struct.

[Alexander Alekseev, 2014/04/15 01:57:16]

Done.

+    CustomizedWallpaperFilesExist();
+
+    bool AllRescaledExist() const;
+
+    bool downloaded;
+    bool rescaled_small;
+    bool rescaled_large;
+  };
+
   // For testing.
   class TestApi {
    public:
     explicit TestApi(WallpaperManager* wallpaper_manager);
     virtual ~TestApi();
 
     base::FilePath current_wallpaper_path();
 
     bool GetWallpaperFromCache(const std::string& user_id,
                                gfx::ImageSkia* image);
@@ skipping 156 matching lines @@
   // 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,
                           bool update_wallpaper);
 
+  // Use given files as new default wallpaper.
+  // Reloads current wallpaper, if old default was loaded.
+  // Current value of default_wallpaper_image_ is destroyed.
+  // Sets default_wallpaper_image_ either to |small_wallpaper_image| or
+  // |large_wallpaper_image| depending on GetAppropriateResolution().
+  void SetDefaultWallpaperPath(
+      const base::FilePath& customized_default_wallpaper_file_small,
+      scoped_ptr<gfx::ImageSkia> small_wallpaper_image,
+      const base::FilePath& customized_default_wallpaper_file_large,
+      scoped_ptr<gfx::ImageSkia> large_wallpaper_image);
+
   // 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);
@@ skipping 42 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);
 
   // Returns the appropriate wallpaper resolution for all root windows.
   static WallpaperResolution GetAppropriateResolution();
 
+  // This is called from CustomizationDocument.
+  // resized_directory - directory where resized versions are stored

[Daniel Erat, 2014/04/14 15:26:15]

match the style of other comments in this file: "|resized_directory| is the
directory where resized versions are stored and must be writable."

[Alexander Alekseev, 2014/04/15 01:57:16]

Done.

+  // (must be writable)
+  void SetCustomizedDefaultWallpaper(const GURL& wallpaper_url,
+                                     const base::FilePath& downloaded_file,
+                                     const base::FilePath& resized_directory);
+
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerBrowserTestDefaultWallpaper;
   friend class WallpaperManagerPolicyTest;
 
   typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
 
   // Set |wallpaper| controlled by policy.
   void SetPolicyControlledWallpaper(const std::string& user_id,
@@ skipping 142 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;
 
+  // This is called after we check that supplied default wallpaper files exist.
+  void SetCustomizedDefaultWallpaperAfterCheck(
+      const GURL& wallpaper_url,
+      const base::FilePath& downloaded_file,
+      scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files,
+      scoped_ptr<CustomizedWallpaperFilesExist> exist);
+
+  // Starts rescaling of customized wallpaper.
+  void OnCustomizedDefaultWallpaperDecoded(
+      const GURL& wallpaper_url,
+      scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files,
+      const UserImage& user_image);
+
+  // Resize and save customized default wallpaper.
+  void ResizeCustomizedDefaultWallpaper(
+      scoped_ptr<gfx::ImageSkia> image,
+      const UserImage::RawImage& raw_image,
+      const CustomizedWallpaperRescaledFiles* rescaled_files,
+      bool* success,
+      gfx::ImageSkia* small_wallpaper_image,
+      gfx::ImageSkia* large_wallpaper_image);
+
+  // Check the result of ResizeCustomizedDefaultWallpaper and finally
+  // apply Customized Default Wallpaper.
+  void OnCustomizedDefaultWallpaperResized(
+      const GURL& wallpaper_url,
+      scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files,
+      scoped_ptr<bool> success,
+      scoped_ptr<gfx::ImageSkia> small_wallpaper_image,
+      scoped_ptr<gfx::ImageSkia> large_wallpaper_image);
+
+  // These global default values are used to set customized default
+  // wallpaper path in InitializeWallpaper().
+  static base::FilePath GetCustomizedWallpaperDefaultRescaledFileName(

[Daniel Erat, 2014/04/14 15:26:15]

please make this and ShouldUseCustomizedDefaultWallpaper() be functions in an
anonymous namespace too

[Alexander Alekseev, 2014/04/15 01:57:16]

Done.

+      const char* suffix);
+
+  // If DesktopBackgroundController should start with customized default
+  // wallpaper in InitializeWallpaper().
+  static bool ShouldUseCustomizedDefaultWallpaper();
+
   // Init |*default_*_wallpaper_file_| from given command line and
   // clear |default_wallpaper_image_|.
   void SetDefaultWallpaperPathsFromCommandLine(base::CommandLine* command_line);
 
   // Sets wallpaper to decoded default.
   void OnDefaultWallpaperDecoded(const base::FilePath& path,
                                  const ash::WallpaperLayout layout,
                                  scoped_ptr<UserImage>* result,
                                  MovableOnDestroyCallbackHolder on_finish,
                                  const UserImage& wallpaper);
@@ skipping 71 matching lines @@
 
   // Current decoded default image is stored in cache.
   scoped_ptr<UserImage> default_wallpaper_image_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_