Move UserImage to user_manager

chrome/browser/chromeos/login/users/user.h

 // Copyright 2014 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_USERS_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
 
 #include <string>
 #include <vector>
 
 #include "ash/session/user_info.h"
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/chromeos/login/users/avatar/user_image.h"
+#include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_type.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 extern const int kDefaultImagesCount;
 
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
@@ skipping 51 matching lines @@
 
   // Whether the user has a default image.
   bool HasDefaultImage() const;
 
   // True if user image can be synced.
   virtual bool CanSyncImage() const;
 
   int image_index() const { return image_index_; }
   bool has_raw_image() const { return user_image_.has_raw_image(); }
   // Returns raw representation of static user image.
-  const UserImage::RawImage& raw_image() const {
+  const user_manager::UserImage::RawImage& raw_image() const {
     return user_image_.raw_image();
   }
   bool has_animated_image() const { return user_image_.has_animated_image(); }
   // Returns raw representation of animated user image.
-  const UserImage::RawImage& animated_image() const {
+  const user_manager::UserImage::RawImage& animated_image() const {
     return user_image_.animated_image();
   }
 
   // Whether |raw_image| contains data in format that is considered safe to
   // decode in sensitive environment (on Login screen).
   bool image_is_safe_format() const { return user_image_.is_safe_format(); }
 
   // Returns the URL of user image, if there is any. Currently only the profile
   // image has a URL, for other images empty URL is returned.
   GURL image_url() const { return user_image_.url(); }
@@ skipping 54 matching lines @@
   explicit User(const std::string& email);
   virtual ~User();
 
   const std::string* GetAccountLocale() const {
     return account_locale_.get();
   }
 
   // Setters are private so only UserManager can call them.
   void SetAccountLocale(const std::string& resolved_account_locale);
 
-  void SetImage(const UserImage& user_image, int image_index);
+  void SetImage(const user_manager::UserImage& user_image, int image_index);
 
   void SetImageURL(const GURL& image_url);
 
   // Sets a stub image until the next |SetImage| call. |image_index| may be
   // one of |kExternalImageIndex| or |kProfileImageIndex|.
   // If |is_loading| is |true|, that means user image is being loaded from file.
   void SetStubImage(int image_index, bool is_loading);
 
   void set_display_name(const base::string16& display_name) {
     display_name_ = display_name;
   }
 
   void set_given_name(const base::string16& given_name) {
     given_name_ = given_name;
   }
 
   void set_display_email(const std::string& display_email) {
     display_email_ = display_email;
   }
 
-  const UserImage& user_image() const { return user_image_; }
+  const user_manager::UserImage& user_image() const { return user_image_; }
 
   void set_oauth_token_status(OAuthTokenStatus status) {
     oauth_token_status_ = status;
   }
 
   void set_force_online_signin(bool force_online_signin) {
     force_online_signin_ = force_online_signin;
   }
 
   void set_username_hash(const std::string& username_hash) {
@@ skipping 18 matching lines @@
 
   // True if user has google account (not a guest or managed user).
   bool has_gaia_account() const;
 
  private:
   std::string email_;
   base::string16 display_name_;
   base::string16 given_name_;
   // The displayed user email, defaults to |email_|.
   std::string display_email_;
-  UserImage user_image_;
+  user_manager::UserImage user_image_;
   OAuthTokenStatus oauth_token_status_;
   bool force_online_signin_;
 
   // This is set to chromeos locale if account data has been downloaded.
   // (Or failed to download, but at least one download attempt finished).
   // An empty string indicates error in data load, or in
   // translation of Account locale to chromeos locale.
   scoped_ptr<std::string> account_locale_;
 
   // Used to identify homedir mount point.
@@ skipping 23 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_