Apply default wallpaper from customization manifest.

ash/desktop_background/desktop_background_controller.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 ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/display/display_controller.h"
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image_skia.h"
 
 typedef unsigned int SkColor;
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 
+// -1

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

either turn this comment into a sentence or delete it

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

Done.

+extern const int ASH_EXPORT kInvalidResourceID;

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

this name is too generic to be at the top level of the ash namespace. make it be
a public static member of DesktopBackgroundController instead.

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

Done.

+
 enum WallpaperLayout {
   // Center the wallpaper on the desktop without scaling it. The wallpaper
   // may be cropped.
   WALLPAPER_LAYOUT_CENTER,
   // Scale the wallpaper (while preserving its aspect ratio) to cover the
   // desktop; the wallpaper may be cropped.
   WALLPAPER_LAYOUT_CENTER_CROPPED,
   // Scale the wallpaper (without preserving its aspect ratio) to match the
   // desktop's size.
   WALLPAPER_LAYOUT_STRETCH,
   // Tile the wallpaper over the background without scaling it.
   WALLPAPER_LAYOUT_TILE,
+  // This is a special value for WallpaperIsAlreadyLoaded()
+  // meaning "do not compare layouts".
+  WALLPAPER_LAYOUT_UNKNOWN,

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

please don't add a special-purpose value like this to the enum; it means that
all of the code that uses this enum needs to handle it.

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

Done.

 };
 
 const SkColor kLoginWallpaperColor = 0xFEFEFE;
 
 class DesktopBackgroundControllerObserver;
 class WallpaperResizer;
 
 // Updates background layer if necessary.
 class ASH_EXPORT DesktopBackgroundController
     : public DisplayController::Observer {
@@ skipping 51 matching lines @@
 
   // Overrides DisplayController::Observer:
   virtual void OnDisplayConfigurationChanged() OVERRIDE;
 
   // Returns the maximum size of all displays combined in native
   // resolutions.  Note that this isn't the bounds of the display who
   // has maximum resolutions. Instead, this returns the size of the
   // maximum width of all displays, and the maximum height of all displays.
   static gfx::Size GetMaxDisplaySizeInNative();
 
+  // Returns true if the specified wallpaper is already stored
+  // in |current_wallpaper_|.
+  // If |image| is NULL, resource_id is compared.
+  // If |layout| == WALLPAPER_LAYOUT_UNKNOWN, layout is ignored.
+  bool WallpaperIsAlreadyLoaded(const gfx::ImageSkia* image,
+                                int resource_id,
+                                WallpaperLayout layout) const;
+
  private:
   friend class DesktopBackgroundControllerTest;
   //  friend class chromeos::WallpaperManagerBrowserTestDefaultWallpaper;
   FRIEND_TEST_ALL_PREFIXES(DesktopBackgroundControllerTest, GetMaxDisplaySize);
 
-  // Returns true if the specified wallpaper is already stored
-  // in |current_wallpaper_|.
-  // If |image| is NULL, resource_id is compared.
-  bool WallpaperIsAlreadyLoaded(const gfx::ImageSkia* image,
-                                int resource_id,
-                                WallpaperLayout layout) const;
-
   // Creates view for all root windows, or notifies them to repaint if they
   // already exist.
   void SetDesktopBackgroundImageMode();
 
   // Creates and adds component for current mode (either Widget or Layer) to
   // |root_window|.
   void InstallDesktopController(aura::Window* root_window);
 
   // Creates and adds component for current mode (either Widget or Layer) to
   // all root windows.
@@ skipping 33 matching lines @@
   base::OneShotTimer<DesktopBackgroundController> timer_;
 
   int wallpaper_reload_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_