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 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 135 matching lines @@
   return gfx::Size(width, height);
 }
 
 bool DesktopBackgroundController::WallpaperIsAlreadyLoaded(
     const gfx::ImageSkia* image,
     int resource_id,
     WallpaperLayout layout) const {
   if (!current_wallpaper_.get())
     return false;
 
-  if (layout != current_wallpaper_->layout())
+  // Do not compare layouts if WALLPAPER_LAYOUT_UNKNOWN passed.
+  if (WALLPAPER_LAYOUT_UNKNOWN != layout &&

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

please put the variable first and the constant second in comparisons so the code
reads like english

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

Done.

+      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