Remove use of index in wallpaper picker code and some refactor

chrome/browser/chromeos/login/wallpaper_manager.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 CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
 
 #include <string>
 
-#include "ash/desktop_background/desktop_background_resources.h"
+#include "ash/desktop_background/desktop_background_controller.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_image_loader.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ skipping 94 matching lines @@
   // Cancel any previous timer if any.
   void RestartTimer();
 
   // Saves custom wallpaper to file, post task to generate thumbnail and updates
   // local state preferences.
   void SetCustomWallpaper(const std::string& username,
                           ash::WallpaperLayout layout,
                           User::WallpaperType type,
                           const UserImage& wallpaper);
 
-  // Sets wallpaper to default wallpaper at |index|.
-  void SetDefaultWallpaper(int index);
+  // Sets wallpaper to default wallpaper.
+  void SetDefaultWallpaper();
 
   // Sets one of the default wallpapers for the specified user and saves this
   // settings in local state.
   void SetInitialUserWallpaper(const std::string& username, bool is_persistent);
 
   // Sets selected wallpaper information for |username| and saves it to Local
   // State if |is_persistent| is true.
   void SetUserWallpaperInfo(const std::string& username,
                             const WallpaperInfo& info,
                             bool is_persistent);
 
   // Sets last selected user on user pod row.
   void SetLastSelectedUser(const std::string& last_selected_user);
 
   // Sets |email|'s wallpaper.
   void SetUserWallpaper(const std::string& email);
 
-  // Sets the default wallpaper for the sign-in screen.
-  void SetSigninWallpaper();
-
   // Sets wallpaper to |wallpaper|.
   void SetWallpaperFromImageSkia(const gfx::ImageSkia& wallpaper,
                                  ash::WallpaperLayout layout);
 
   // Updates current wallpaper. It may switch the size of wallpaper based on the
   // current display's resolution.
   void UpdateWallpaper();
 
  private:
   friend class WallpaperManagerBrowserTest;
@@ skipping 122 matching lines @@
                                 const WallpaperInfo& info,
                                 bool update_wallpaper,
                                 const FilePath& wallpaper_path);
 
   // The number of loaded wallpapers.
   int loaded_wallpapers_;
 
   // The file path of current loaded/loading custom/online wallpaper.
   FilePath current_wallpaper_path_;
 
-  // The index of current loaded/loading default wallpaper.
-  int current_default_wallpaper_index_;
-
   // Loads user wallpaper from its file.
   scoped_refptr<UserImageLoader> wallpaper_loader_;
 
   // Logged-in user wallpaper information.
   WallpaperInfo current_user_wallpaper_info_;
 
   // Caches wallpapers of users. Accessed only on UI thread.
   CustomWallpaperMap wallpaper_cache_;
 
   CustomWallpaperMap custom_wallpaper_thumbnail_cache_;
 
   // The last selected user on user pod row.
   std::string last_selected_user_;
 
   bool should_cache_wallpaper_;
 
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
 
   content::NotificationRegistrar registrar_;
 
   base::OneShotTimer<WallpaperManager> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_