Added support for animated/nonanimated user image.

chrome/browser/chromeos/login/user.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/user.h"
 
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
+#include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
 namespace {
 
 // Resource ID of the image to use as stub image.
 const int kStubImageResourceID = IDR_PROFILE_PICTURE_LOADING;
 
 // Returns account name portion of an email.
 std::string GetUserName(const std::string& email) {
   std::string::size_type i = email.find('@');
   if (i == 0 || i == std::string::npos) {
     return email;
   }
   return email.substr(0, i);
 }
 
+bool IsGIFImage(const std::vector<unsigned char>& data) {

[Ivan Korotkov, 2012/05/29 10:50:23]

Feels like this should part of UserImage.

[ygorshenin1, 2012/05/30 12:17:34]

Done.

+  const char* kGIFStamp = "GIF";

[Ivan Korotkov, 2012/05/29 10:50:23]

Better: static const char kGIFStamp[] = "GIF";
then you can use sizeof(kGIFStamp)

[ygorshenin1, 2012/05/30 12:17:34]

Done.

+  const size_t gif_stamp_len = strlen(kGIFStamp);
+
+  if (data.size() >= gif_stamp_len &&
+      memcmp(&data[0], kGIFStamp, gif_stamp_len) == 0) {
+    return true;
+  }
+  return false;
+}
+
 }  // namespace
 
 User::User(const std::string& email, bool is_guest)
     : email_(email),
+      has_gif_image_(false),
       oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN),
       image_index_(kInvalidImageIndex),
       image_is_stub_(false),
       is_guest_(is_guest) {
   // The email address of a demo user is for internal purposes only,
   // never meant for display.
   if (email != kDemoUser) {
     display_email_ = email;
     is_demo_user_ = false;
   } else {
     is_demo_user_ = true;
   }
   image_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
       kDefaultImageResources[0]);
 }
 
 User::~User() {}
 
-void User::SetImage(const SkBitmap& image, int image_index) {
-  image_ = image;
+void User::SetImage(const UserImage& user_image, int image_index) {
+  image_ = user_image.image();
   image_index_ = image_index;
   image_is_stub_ = false;
+  if (user_image.has_raw_image() && IsGIFImage(user_image.raw_image())) {
+    has_gif_image_ = true;
+    gif_image_ = user_image.raw_image();
+  } else {
+    has_gif_image_ = false;
+    std::vector<unsigned char> tmp;
+    gif_image_.swap(tmp);

[Ivan Korotkov, 2012/05/29 10:50:23]

Why not vector::clear?

[ygorshenin1, 2012/05/30 12:17:34]

To release buffer allocated by vector. Usually, clear or resize methods changes
size of vector, not capacity.

On 2012/05/29 10:50:23, Ivan Korotkov wrote:

+  }
 }
 
 void User::SetStubImage(int image_index) {
   image_ = *ResourceBundle::GetSharedInstance().
       GetBitmapNamed(kStubImageResourceID);
   image_index_ = image_index;
   image_is_stub_ = true;
 }
 
 void User::SetWallpaperThumbnail(const SkBitmap& wallpaper_thumbnail) {
@@ skipping 21 matching lines @@
   }
   size_t domain_start = at_pos + 1;
   std::string domain = user_email.substr(domain_start,
                                          user_email.length() - domain_start);
   return base::StringPrintf("%s (%s)",
                             GetDisplayName().c_str(),
                             domain.c_str());
 }
 
 }  // namespace chromeos