Remove use of index in wallpaper picker code and some refactor

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/desktop_background/desktop_background_resources.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image_skia.h"
 
 typedef unsigned int SkColor;
 
 namespace aura {
 class RootWindow;
 }
 
 namespace ash {
 
+enum WallpaperLayout {
+  CENTER,

[sky, 2012/11/19 22:21:19]

For enums that exist in the ash namespace they need to be named more
specifically. Eg WALLPAPER_LAYOUT_CENTER and WALLPAPER_RESOLUTION_LARGE.

[bshe, 2012/11/20 00:33:59]

Done.

+  CENTER_CROPPED,
+  STRETCH,
+  TILE,
+};
+
+enum WallpaperResolution {
+  LARGE,
+  SMALL
+};
+
+const SkColor kLoginWallpaperColor = 0xFEFEFE;
+
+// Encapsulates wallpaper infomation needed by desktop background controller.
+struct ASH_EXPORT WallpaperInfo {
+  int idr;
+  WallpaperLayout layout;
+};
+
+ASH_EXPORT extern const WallpaperInfo kDefaultLargeWallpaper;
+ASH_EXPORT extern const WallpaperInfo kDefaultSmallWallpaper;
+ASH_EXPORT extern const WallpaperInfo kGuestLargeWallpaper;
+ASH_EXPORT extern const WallpaperInfo kGuestSmallWallpaper;
+
 // The width and height of small/large resolution wallpaper. When screen size is
 // smaller than |kSmallWallpaperMaxWidth| and |kSmallWallpaperMaxHeight|, the
 // small resolution wallpaper should be used. Otherwise, uses the large
 // resolution wallpaper.
 ASH_EXPORT extern const int kSmallWallpaperMaxWidth;
 ASH_EXPORT extern const int kSmallWallpaperMaxHeight;
 ASH_EXPORT extern const int kLargeWallpaperMaxWidth;
 ASH_EXPORT extern const int kLargeWallpaperMaxHeight;
 
 class DesktopBackgroundControllerObserver;
@@ skipping 20 matching lines @@
   void RemoveObserver(DesktopBackgroundControllerObserver* observer);
 
   gfx::ImageSkia GetWallpaper() const;
 
   WallpaperLayout GetWallpaperLayout() const;
 
   // Provides current image on the background, or empty gfx::ImageSkia if there
   // is no image, e.g. background is solid color.
   gfx::ImageSkia GetCurrentWallpaperImage();
 
+  // Gets the IDR of current wallpaper. Returns -1 if current wallpaper is not
+  // a builtin wallpaper.
+  int GetWallpaperIDR() const;
+
   // Initialize root window's background.
   void OnRootWindowAdded(aura::RootWindow* root_window);
 
-  // Loads default wallpaper at |index| asynchronously but does not set the
-  // loaded image to current wallpaper. Resource bundle will cache the loaded
-  // image.
-  void CacheDefaultWallpaper(int index);
-
-  // Loads default wallpaper at |index| asynchronously and sets to current
-  // wallpaper after loaded.
-  void SetDefaultWallpaper(int index);
-
-  // Forces to reload the current default wallpaper. A different resolution
-  // wallpaper maybe loaded.
-  void ReloadDefaultWallpaper();
+  // Loads builtin wallpaper asynchronously and sets to current wallpaper after
+  // loaded.
+  void SetDefaultWallpaper(WallpaperInfo info);

[sky, 2012/11/19 22:21:19]

const WallpaperInfo&

[bshe, 2012/11/20 00:33:59]

Done.

 
   // Sets the user selected custom wallpaper. Called when user selected a file
   // from file system or changed the layout of wallpaper.
   void SetCustomWallpaper(const gfx::ImageSkia& wallpaper,
                           WallpaperLayout layout);
 
   // Cancels the current wallpaper loading operation.
   void CancelPendingWallpaperOperation();
 
   // Sets the desktop background to solid color mode and creates a solid
@@ skipping 74 matching lines @@
   scoped_refptr<WallpaperOperation> wallpaper_op_;
 
   base::WeakPtrFactory<DesktopBackgroundController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_