Apply default wallpaper from customization manifest.

ash/desktop_background/desktop_background_controller.cc

 // 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.
 
 #include "ash/desktop_background/desktop_background_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
@@ skipping 25 matching lines @@
 
 namespace ash {
 namespace {
 
 // How long to wait reloading the wallpaper after the max display has
 // changed?
 const int kWallpaperReloadDelayMs = 2000;
 
 }  // namespace
 
+const int DesktopBackgroundController::kInvalidResourceID = -1;
+
 DesktopBackgroundController::DesktopBackgroundController()
     : locked_(false),
       desktop_background_mode_(BACKGROUND_NONE),
       wallpaper_reload_delay_(kWallpaperReloadDelayMs) {
   Shell::GetInstance()->display_controller()->AddObserver(this);
 }
 
 DesktopBackgroundController::~DesktopBackgroundController() {
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
 }
@@ skipping 35 matching lines @@
   }
 
   InstallDesktopController(root_window);
 }
 
 bool DesktopBackgroundController::SetWallpaperImage(const gfx::ImageSkia& image,
                                                     WallpaperLayout layout) {
   VLOG(1) << "SetWallpaper: image_id=" << WallpaperResizer::GetImageId(image)
           << " layout=" << layout;
 
-  if (WallpaperIsAlreadyLoaded(&image, kInvalidResourceID, layout)) {
+  if (WallpaperIsAlreadyLoaded(&image, kInvalidResourceID, true, layout)) {

[Nikita (slow), 2014/04/15 12:39:24]

nit: /* compare layouts */

[Alexander Alekseev, 2014/04/15 22:47:31]

Done.

     VLOG(1) << "Wallpaper is already loaded";
     return false;
   }
 
   current_wallpaper_.reset(
       new WallpaperResizer(image, GetMaxDisplaySizeInNative(), layout));
   current_wallpaper_->StartResize();
 
   FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver,
                     observers_,
                     OnWallpaperDataChanged());
   SetDesktopBackgroundImageMode();
   return true;
 }
 
 bool DesktopBackgroundController::SetWallpaperResource(int resource_id,
                                                        WallpaperLayout layout) {
   VLOG(1) << "SetWallpaper: resource_id=" << resource_id
           << " layout=" << layout;
 
-  if (WallpaperIsAlreadyLoaded(NULL, resource_id, layout)) {
+  if (WallpaperIsAlreadyLoaded(NULL, resource_id, true, layout)) {

[Nikita (slow), 2014/04/15 12:39:24]

nit: /* compare layouts */

[Alexander Alekseev, 2014/04/15 22:47:31]

Done.

     VLOG(1) << "Wallpaper is already loaded";
     return false;
   }
   current_wallpaper_.reset(
       new WallpaperResizer(resource_id, GetMaxDisplaySizeInNative(), layout));
   current_wallpaper_->StartResize();
 
   FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver, observers_,
                     OnWallpaperDataChanged());
   SetDesktopBackgroundImageMode();
@@ skipping 54 matching lines @@
     }
     width = std::max(size_in_pixel.width(), width);
     height = std::max(size_in_pixel.height(), height);
   }
   return gfx::Size(width, height);
 }
 
 bool DesktopBackgroundController::WallpaperIsAlreadyLoaded(
     const gfx::ImageSkia* image,
     int resource_id,
+    bool compare_layouts,
     WallpaperLayout layout) const {
   if (!current_wallpaper_.get())
     return false;
 
-  if (layout != current_wallpaper_->layout())
+  // Compare layouts only if necessary.
+  if (compare_layouts && layout != current_wallpaper_->layout())
     return false;
 
   if (image) {
     return WallpaperResizer::GetImageId(*image) ==
            current_wallpaper_->original_image_id();
   }
 
   return current_wallpaper_->resource_id() == resource_id;
 }
 
@@ skipping 76 matching lines @@
                 : kShellWindowId_DesktopBackgroundContainer;
 }
 
 void DesktopBackgroundController::UpdateWallpaper() {
   current_wallpaper_.reset(NULL);
   ash::Shell::GetInstance()->user_wallpaper_delegate()->
       UpdateWallpaper(true /* clear cache */);
 }
 
 }  // namespace ash