Implement user selected wallpaper feature.

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/desktop_background/desktop_background_view.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
@@ skipping 38 matching lines @@
   }
 
   void Cancel() {
     cancel_flag_.Set();
   }
 
   const SkBitmap* wallpaper() {
     return wallpaper_;
   }
 
-  ImageLayout image_layout() {
+  WallpaperLayout wallpaper_layout() {
     return layout_;
   }
 
   int index() {
     return index_;
   }
 
  private:
   friend class base::RefCountedThreadSafe<
       DesktopBackgroundController::WallpaperOperation>;
 
   base::CancellationFlag cancel_flag_;
 
   const SkBitmap* wallpaper_;
-  ImageLayout layout_;
+  WallpaperLayout layout_;
   int index_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperOperation);
 };
 
 DesktopBackgroundController::DesktopBackgroundController()
     : desktop_background_mode_(BACKGROUND_IMAGE),
       previous_index_(-1),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
@@ skipping 11 matching lines @@
   wallpaper_op_ = new WallpaperOperation(index);
   base::WorkerPool::PostTaskAndReply(
       FROM_HERE,
       base::Bind(&WallpaperOperation::Run, wallpaper_op_),
       base::Bind(&DesktopBackgroundController::OnWallpaperLoadCompleted,
                  weak_ptr_factory_.GetWeakPtr(),
                  wallpaper_op_),
       true /* task_is_slow */);
 }
 
+void DesktopBackgroundController::SetCustomWallpaper(
+    const SkBitmap& wallpaper, WallpaperLayout layout) {

[flackr, 2012/05/04 19:06:17]

I believe we want 1 argument per line in function decl.

[bshe, 2012/05/08 22:22:18]

Done.

+  internal::RootWindowLayoutManager* root_window_layout =
+      Shell::GetInstance()->root_window_layout();
+  root_window_layout->SetBackgroundLayer(NULL);
+  internal::CreateDesktopBackground(wallpaper, layout);
+  desktop_background_mode_ = BACKGROUND_IMAGE;
+}
+
 void DesktopBackgroundController::CancelPendingWallpaperOperation() {
   // Set canceled flag of previous request to skip unneeded loading.
   if (wallpaper_op_.get())
     wallpaper_op_->Cancel();
 
   // Cancel reply callback for previous request.
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void DesktopBackgroundController::SetLoggedInUserWallpaper() {
@@ skipping 22 matching lines @@
   shell->root_window_layout()->SetBackgroundWidget(NULL);
   desktop_background_mode_ = BACKGROUND_SOLID_COLOR;
 }
 
 void DesktopBackgroundController::SetDesktopBackgroundImageMode(
     scoped_refptr<WallpaperOperation> wo) {
   internal::RootWindowLayoutManager* root_window_layout =
       Shell::GetInstance()->root_window_layout();
   root_window_layout->SetBackgroundLayer(NULL);
   if(wo->wallpaper()) {
-    internal::CreateDesktopBackground(*wo->wallpaper(), wo->image_layout());
+    internal::CreateDesktopBackground(*wo->wallpaper(),

[Ben Goodger (Google), 2012/05/07 15:35:08]

seems unnecessary?

[bshe, 2012/05/09 18:51:54]

Sorry, just to clarify, do you mean two parameters are unnecessary (should be
just use one parameter)?

[Ben Goodger (Google), 2012/05/09 19:53:13]

The linewrapping is unnecessary.

+                                      wo->wallpaper_layout());
     desktop_background_mode_ = BACKGROUND_IMAGE;
   }
 }
 
 void DesktopBackgroundController::OnWallpaperLoadCompleted(
     scoped_refptr<WallpaperOperation> wo) {
   SetDesktopBackgroundImageMode(wo);
   previous_index_ = wo->index();
 
   DCHECK(wo.get() == wallpaper_op_.get());
   wallpaper_op_ = NULL;
 }
 
 }  // namespace ash