Speed up custom wallpaper switching time and wallpaper manager code refactor

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_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 33 matching lines @@
  public:
   // UserManager implementation:
   virtual ~UserManagerImpl();
 
   virtual const UserList& GetUsers() const OVERRIDE;
   virtual void UserLoggedIn(const std::string& email,
                             bool browser_restart) OVERRIDE;
   virtual void DemoUserLoggedIn() OVERRIDE;
   virtual void GuestUserLoggedIn() OVERRIDE;
   virtual void EphemeralUserLoggedIn(const std::string& email) OVERRIDE;
-  virtual void InitializeWallpaper() OVERRIDE;
-  virtual void UserSelected(const std::string& email) OVERRIDE;
   virtual void SessionStarted() OVERRIDE;
   virtual void RemoveUser(const std::string& email,
                           RemoveUserDelegate* delegate) OVERRIDE;
   virtual void RemoveUserFromList(const std::string& email) OVERRIDE;
   virtual bool IsKnownUser(const std::string& email) const OVERRIDE;
   virtual const User* FindUser(const std::string& email) const OVERRIDE;
   virtual const User& GetLoggedInUser() const OVERRIDE;
   virtual User& GetLoggedInUser() OVERRIDE;
   virtual void SaveUserOAuthStatus(
       const std::string& username,
       User::OAuthTokenStatus oauth_token_status) OVERRIDE;
   virtual void SaveUserDisplayName(const std::string& username,
                                    const string16& display_name) OVERRIDE;
   virtual string16 GetUserDisplayName(
       const std::string& username) const 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 void GetLoggedInUserWallpaperProperties(User::WallpaperType* type,
-      int* index,
-      base::Time* last_modification_date) 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 UserImage& user_image) OVERRIDE;
   virtual void SetLoggedInUserCustomWallpaperLayout(
       ash::WallpaperLayout layout) OVERRIDE;
   virtual void SaveUserImageFromFile(const std::string& username,
                                      const FilePath& path) OVERRIDE;
-  virtual void SaveUserWallpaperFromFile(
-      const std::string& username,
-      const FilePath& path,
-      ash::WallpaperLayout layout,
-      base::WeakPtr<WallpaperDelegate> delegate) OVERRIDE;
   virtual void SaveUserImageFromProfileImage(
       const std::string& username) OVERRIDE;
   virtual void DownloadProfileImage(const std::string& reason) OVERRIDE;
   virtual bool IsCurrentUserOwner() const OVERRIDE;
   virtual bool IsCurrentUserNew() const OVERRIDE;
   virtual bool IsCurrentUserEphemeral() const OVERRIDE;
   virtual bool IsUserLoggedIn() const OVERRIDE;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
@@ skipping 10 matching lines @@
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
 
  protected:
   UserManagerImpl();
 
   // Returns image filepath for the given user.
   FilePath GetImagePathForUser(const std::string& username);
 
-  // Returns wallpaper/thumbnail filepath for the given user.
-  FilePath GetWallpaperPathForUser(const std::string& username,
-                                   bool is_thumbnail);
-
  private:
   friend class UserManagerImplWrapper;
   friend class UserManagerTest;
   friend class WallpaperManager;
 
   // Loads |users_| from Local State if the list has not been loaded yet.
   // Subsequent calls have no effect. Must be called on the UI thread.
   void EnsureUsersLoaded();
 
-  // Loads wallpaper asynchronously if the current wallpaper is not the
-  // wallpaper of logged in user.
-  void EnsureLoggedInUserWallpaperLoaded();
-
   // Retrieves trusted device policies and removes users from the persistent
   // list if ephemeral users are enabled. Schedules a callback to itself if
   // trusted device policies are not yet available.
   void RetrieveTrustedDevicePolicies();
 
   // Returns true if trusted device policies have successfully been retrieved
   // and ephemeral users are enabled.
   bool AreEphemeralUsersEnabled() const;
 
   // Returns true if the user with the given email address is to be treated as
@@ skipping 10 matching lines @@
   // 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: DAILY|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 GURL& image_url,
                     const UserImage& user_image);
 
-  // Get wallpaper |type|, |index| and |last_modification_date| of |username|
-  // from local state.
-  void GetUserWallpaperProperties(const std::string& username,
-                                 User::WallpaperType* type,
-                                 int* index,
-                                 base::Time* last_modification_date);
-
-  // Set |username|'s wallpaper |type|, |index| and local date to local state.
-  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 GURL& image_url,
                              const UserImage& user_image);
 
-  // Saves wallpaper to file, post task to generate thumbnail and updates local
-  // state preferences.
-  void SaveUserWallpaperInternal(const std::string& username,
-                                 ash::WallpaperLayout layout,
-                                 User::WallpaperType type,
-                                 base::WeakPtr<WallpaperDelegate> delegate,
-                                 const UserImage& user_image);
-
-  // Sets desktop background to custom wallpaper and loads wallpaper thumbnail
-  // asynchronously.
-  void OnCustomWallpaperLoaded(const std::string& email,
-                               ash::WallpaperLayout layout,
-                               const UserImage& wallpaper);
-
-  // Caches the loaded wallpaper for the given user.
-  void OnCustomWallpaperThumbnailLoaded(const std::string& email,
-                                        const UserImage& user_image);
-
-  // Updates the custom wallpaper thumbnail in wallpaper picker UI.
-  void OnThumbnailUpdated(base::WeakPtr<WallpaperDelegate> delegate);
-
-  // Generates a 128x80 thumbnail and saves it to local file system.
-  void GenerateUserWallpaperThumbnail(const std::string& username,
-                                      User::WallpaperType type,
-                                      base::WeakPtr<WallpaperDelegate> delegate,
-                                      const SkBitmap& wallpaper);
-
   // 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,
                        const UserImage& user_image,
                        const FilePath& image_path,
                        int image_index,
                        const GURL& image_url);
 
-  // Saves wallpaper to file with specified path. Runs on FILE thread. Posts
-  // task for saving wallpaper info to Local State on UI thread.
-  void SaveWallpaperToFile(const std::string& username,
-                           const SkBitmap& wallpaper,
-                           const FilePath& wallpaper_path,
-                           ash::WallpaperLayout layout,
-                           User::WallpaperType type);
-
   // Stores path to the image and its index in local state. Runs on UI thread.
   // If |is_async| is true, it has been posted from the FILE thread after
   // saving the image.
   void SaveImageToLocalState(const std::string& username,
                              const std::string& image_path,
                              int image_index,
                              const GURL& image_url,
                              bool is_async);
 
   // Stores layout and type preference in local state. Runs on UI thread.
@@ skipping 66 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_;
 
-  User::WallpaperType current_user_wallpaper_type_;
-
-  int current_user_wallpaper_index_;
-
   // 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_;
 
   // True if user pod row is showed at login screen.
   bool show_users_;
 
   // Cached name of device owner. Defaults to empty string if the value has not
   // been read from trusted device policy yet.
   std::string owner_email_;
@@ skipping 36 matching lines @@
 
   // Timer triggering DownloadProfileDataScheduled for refreshing profile data.
   base::RepeatingTimer<UserManagerImpl> profile_download_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_