Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.

ash/desktop_background/wallpaper_resizer.cc

 // 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.
 
 #include "ash/desktop_background/wallpaper_resizer.h"
 
 #include "ash/desktop_background/wallpaper_resizer_observer.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 75 matching lines @@
         }
     }
   }
 
   *resized_bitmap_out = new_bitmap;
   resized_bitmap_out->setImmutable();
 }
 
 }  // namespace
 
+const int kInvalidResourceID = -1;
+
 // static
 uint32_t WallpaperResizer::GetImageId(const gfx::ImageSkia& image) {
   const gfx::ImageSkiaRep& image_rep = image.GetRepresentation(1.0f);
   return image_rep.is_null() ? 0 : image_rep.sk_bitmap().getGenerationID();
 }
 
 WallpaperResizer::WallpaperResizer(int image_resource_id,
                                    const gfx::Size& target_size,
                                    WallpaperLayout layout)
-    : image_(*(ui::ResourceBundle::GetSharedInstance().
-          GetImageNamed(image_resource_id).ToImageSkia())),
+    : image_(*(ui::ResourceBundle::GetSharedInstance()
+                   .GetImageNamed(image_resource_id)
+                   .ToImageSkia())),
       original_image_id_(GetImageId(image_)),
+      resource_id_(image_resource_id),
       target_size_(target_size),
       layout_(layout),
       weak_ptr_factory_(this) {
   image_.MakeThreadSafe();
 }
 
 WallpaperResizer::WallpaperResizer(const gfx::ImageSkia& image,
                                    const gfx::Size& target_size,
                                    WallpaperLayout layout)
     : image_(image),
       original_image_id_(GetImageId(image_)),
+      resource_id_(kInvalidResourceID),
       target_size_(target_size),
       layout_(layout),
       weak_ptr_factory_(this) {
   image_.MakeThreadSafe();
 }
 
 WallpaperResizer::~WallpaperResizer() {
 }
 
 void WallpaperResizer::StartResize() {
@@ skipping 20 matching lines @@
 }
 
 void WallpaperResizer::OnResizeFinished(SkBitmap* resized_bitmap) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   image_ = gfx::ImageSkia::CreateFrom1xBitmap(*resized_bitmap);
   FOR_EACH_OBSERVER(WallpaperResizerObserver, observers_,
                     OnWallpaperResized());
 }
 
 } // namespace ash