Added support for animated/nonanimated user image.

chrome/browser/chromeos/login/user.cc

Index: chrome/browser/chromeos/login/user.cc
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
index a536970f640cdfa0a41f5086f08ba0efbd1085e5..6af1a515ec21423ba72d082bc2580b569afc33e2 100644
--- a/chrome/browser/chromeos/login/user.cc
+++ b/chrome/browser/chromeos/login/user.cc
@@ -31,7 +31,7 @@ std::string GetUserName(const std::string& email) {
 
 User::User(const std::string& email, bool is_guest)
     : email_(email),
-      image_(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+      user_image_(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           kDefaultImageResources[0])),
       oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN),
       image_index_(kInvalidImageIndex),
@@ -49,15 +49,15 @@ User::User(const std::string& email, bool is_guest)
 
 User::~User() {}
 
-void User::SetImage(const gfx::ImageSkia& image, int image_index) {
-  image_ = image;
+void User::SetImage(const UserImage& user_image, int image_index) {
+  user_image_ = user_image;
   image_index_ = image_index;
   image_is_stub_ = false;
 }
 
 void User::SetStubImage(int image_index) {
-  image_ = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      kStubImageResourceID);
+  user_image_.SetImage(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+      kStubImageResourceID));
   image_index_ = image_index;
   image_is_stub_ = true;
 }
@@ -77,4 +77,12 @@ string16 User::GetDisplayName() const {
   return display_name_;
 }
 
+bool User::GetAnimatedImage(UserImage::RawImage* raw_image) const {
+  if (raw_image && has_animated_image()) {
+    *raw_image = user_image_.raw_image();
+    return true;
+  }
+  return false;
+}
+
 }  // namespace chromeos