Reland "Implement random wallpaper feature"

chrome/browser/chromeos/login/user_manager_impl.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_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 47 matching lines @@
   virtual User& GetLoggedInUser() OVERRIDE;
   virtual bool IsDisplayNameUnique(
       const std::string& display_name) const OVERRIDE;
   virtual void SaveUserOAuthStatus(
       const std::string& username,
       User::OAuthTokenStatus oauth_token_status) OVERRIDE;
   virtual void SaveUserDisplayEmail(const std::string& username,
                                     const std::string& display_email) OVERRIDE;
   virtual std::string GetUserDisplayEmail(
       const std::string& username) const OVERRIDE;
-  virtual int GetUserWallpaperIndex() OVERRIDE;
-  virtual void SaveUserWallpaperIndex(int wallpaper_index) OVERRIDE;
+  virtual int GetLoggedInUserWallpaperIndex() OVERRIDE;
+  virtual void GetLoggedInUserWallpaperProperties(User::WallpaperType& type,
+                                                  int& index) OVERRIDE;
+  virtual void SaveLoggedInUserWallpaperProperties(User::WallpaperType type,
+                                                   int index) OVERRIDE;
   virtual void SaveUserDefaultImageIndex(const std::string& username,
                                          int image_index) OVERRIDE;
   virtual void SaveUserImage(const std::string& username,
                              const SkBitmap& image) OVERRIDE;
   virtual void SaveUserImageFromFile(const std::string& username,
                                      const FilePath& path) OVERRIDE;
   virtual void SaveUserImageFromProfileImage(
       const std::string& username) OVERRIDE;
   virtual void DownloadProfileImage(const std::string& reason) OVERRIDE;
   virtual void LoadKeyStore() OVERRIDE;
@@ skipping 42 matching lines @@
   bool AreEphemeralUsersEnabled() const;
 
   // Returns true if the user with the given email address is to be treated as
   // ephemeral.
   bool IsEphemeralUser(const std::string& email) const;
 
   // Returns the user with the given email address if found in the persistent
   // list. Returns |NULL| otherwise.
   const User* FindUserInList(const std::string& email) const;
 
-  int FindUserWallpaperIndex(const std::string& email);
-
   // Makes stub user the current logged-in user (for test paths).
   void StubUserLoggedIn();
 
   // Notifies on new user session.
   void NotifyOnLogin();
 
   // Reads user's oauth token status from local state preferences.
   User::OAuthTokenStatus LoadUserOAuthStatus(const std::string& username) const;
 
   void SetCurrentUserIsOwner(bool is_current_user_owner);
 
   // Sets one of the default images for the specified user and saves this
   // setting in local state.
   // Does not send LOGIN_USER_IMAGE_CHANGED notification.
   void SetInitialUserImage(const std::string& username);
 
   // Sets one of the default wallpapers for the specified user and saves this
   // settings in local state.
   void SetInitialUserWallpaper(const std::string& username);
 
+  // Migrate the old wallpaper index to a new wallpaper structure.
+  // The new wallpaper structure is:
+  // { WallpaperType: RANDOM|CUSTOMIZED|DEFAULT,
+  //   index: index of the default wallpapers }
+  void MigrateWallpaperData();
+
   // Sets image for user |username| and sends LOGIN_USER_IMAGE_CHANGED
   // notification unless this is a new user and image is set for the first time.
   // If |image| is empty, sets a stub image for the user.
   void SetUserImage(const std::string& username,
                     int image_index,
                     const SkBitmap& image);
 
+  void GetUserWallpaperProperties(const std::string& username,
+                                 User::WallpaperType& type,
+                                 int& index);
+  void SaveUserWallpaperProperties(const std::string& username,
+                                   User::WallpaperType type,
+                                   int index);
+
   // Saves image to file, updates local state preferences to given image index
   // and sends LOGIN_USER_IMAGE_CHANGED notification.
   void SaveUserImageInternal(const std::string& username,
                              int image_index,
                              const SkBitmap& image);
 
   // Saves image to file with specified path and sends LOGIN_USER_IMAGE_CHANGED
   // notification. Runs on FILE thread. Posts task for saving image info to
   // Local State on UI thread.
   void SaveImageToFile(const std::string& username,
@@ skipping 64 matching lines @@
   // Cached flag of whether the currently logged-in user existed before this
   // login.
   bool is_current_user_new_;
 
   // Cached flag of whether the currently logged-in user is ephemeral. Storage
   // of persistent information is avoided for such users by not adding them to
   // the user list in local state, not downloading their custom user images and
   // mounting their cryptohomes using tmpfs.
   bool is_current_user_ephemeral_;
 
-  // Cache current user selected index in memory.
+  User::WallpaperType current_user_wallpaper_type_;
+
   int current_user_wallpaper_index_;
 
   // The key store for the current user has been loaded. This flag is needed to
   // ensure that the key store will not be loaded twice in the policy recovery
   // "safe-mode".
   bool key_store_loaded_;
   // Cached flag indicating whether ephemeral users are enabled. Defaults to
   // |false| if the value has not been read from trusted device policy yet.
   bool ephemeral_users_enabled_;
 
@@ skipping 29 matching lines @@
 
   // Data URL for |downloaded_profile_image_|.
   std::string downloaded_profile_image_data_url_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_