Revert "Added support for animated/nonanimated user image. There are no"

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 14 matching lines @@
 
 class SkBitmap;
 class FilePath;
 class PrefService;
 class ProfileDownloader;
 class ProfileSyncService;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
-class UserImage;
 
 // Implementation of the UserManager.
 class UserManagerImpl : public UserManager,
                         public ProfileDownloaderDelegate,
                         public ProfileSyncServiceObserver,
                         public content::NotificationObserver {
  public:
   // UserManager implementation:
   virtual ~UserManagerImpl();
 
@@ skipping 21 matching lines @@
   virtual std::string GetUserDisplayEmail(
       const std::string& username) const 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 UserImage& user_image) OVERRIDE;
+                             const SkBitmap& 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,
                                          WallpaperDelegate* delegate) OVERRIDE;
   virtual void SaveUserImageFromProfileImage(
       const std::string& username) OVERRIDE;
@@ skipping 82 matching lines @@
   // 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 UserImage& user_image);
+                    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 UserImage& user_image);
+                             const SkBitmap& 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,
                                  WallpaperDelegate* delegate,
-                                 const UserImage& user_image);
+                                 const SkBitmap& image);
 
   // Sets desktop background to custom wallpaper and loads wallpaper thumbnail
   // asynchronously.
   void OnCustomWallpaperLoaded(const std::string& email,
                                ash::WallpaperLayout layout,
-                               const UserImage& wallpaper);
+                               const SkBitmap& wallpaper);
 
   // Caches the loaded wallpaper for the given user.
   void OnCustomWallpaperThumbnailLoaded(const std::string& email,
-                                        const UserImage& user_image);
+                                        const SkBitmap& wallpaper);
 
   // Updates the custom wallpaper thumbnail in wallpaper picker UI.
   void OnThumbnailUpdated(WallpaperDelegate* delegate);
 
   // Generates a 128x80 thumbnail and saves it to local file system.
   void GenerateUserWallpaperThumbnail(const std::string& username,
                                       User::WallpaperType type,
                                       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 SkBitmap& image,
                        const FilePath& image_path,
                        int image_index);
 
   // 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,
                              bool is_async);
 
   // Stores layout and type preference in local state. Runs on UI thread.
   void SaveWallpaperToLocalState(const std::string& username,
                                  const std::string& wallpaper_path,
                                  ash::WallpaperLayout layout,
                                  User::WallpaperType type);
 
   // Saves |image| to the specified |image_path|. Runs on FILE thread.
-  bool SaveBitmapToFile(const UserImage& user_image,
+  bool SaveBitmapToFile(const SkBitmap& image,
                         const FilePath& image_path);
 
   // Initializes |downloaded_profile_picture_| with the picture of the logged-in
   // user.
   void InitDownloadedProfileImage();
 
   // Deletes user's image file. Runs on FILE thread.
   void DeleteUserImage(const FilePath& image_path);
 
   // Updates current user ownership on UI thread.
@@ skipping 91 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_