[cros] Users without no profile image get a gray avatar when Local State is loaded.

chrome/browser/chromeos/login/user_manager.cc

 // Copyright (c) 2011 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_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 61 matching lines @@
 // depends on that and it's hard to figure out what).
 const char kGuestUser[] = "";
 
 // Stub user email (for test paths).
 const char kStubUser[] = "stub-user@example.com";
 
 // Names of nodes with info about user image.
 const char kImagePathNodeName[] = "path";
 const char kImageIndexNodeName[] = "index";
 
-// Index of the default image used as stub while the real user image is loading
-// from file and for the |kStubUser| user.
+// Index of the default image used for the |kStubUser| user.
 const int kStubDefaultImageIndex = 0;
 
 // Delay betweeen user login and attempt to update user's profile image.
 const long kProfileImageDownloadDelayMs = 10000;
 
 base::LazyInstance<UserManager> g_user_manager = LAZY_INSTANCE_INITIALIZER;
 
 // Enum for reporting histograms about profile picture download.
 enum ProfileDownloadResult {
   kDownloadSuccessChanged,
@@ skipping 490 matching lines @@
           // backward compatibility.
           std::string image_path;
           base::DictionaryValue* image_properties;
           if (prefs_images->GetStringWithoutPathExpansion(email, &image_path)) {
             int image_id = User::kInvalidImageIndex;
             if (IsDefaultImagePath(image_path, &image_id)) {
               user->SetImage(GetDefaultImage(image_id), image_id);
             } else {
               int image_index = User::kExternalImageIndex;
               // Until image has been loaded, use a stub.
-              user->SetImage(GetDefaultImage(kStubDefaultImageIndex),
+              user->SetImage(*ResourceBundle::GetSharedInstance().
+                                 GetBitmapNamed(IDR_PROFILE_PICTURE_LOADING),
                              image_index);
               DCHECK(!image_path.empty());
               // Load user image asynchronously.
               image_loader_->Start(
                   image_path, 0,
                   base::Bind(&UserManager::SetUserImage,
                              base::Unretained(this), email, image_index));
             }
           } else if (prefs_images->GetDictionaryWithoutPathExpansion(
                          email, &image_properties)) {
             int image_index = User::kInvalidImageIndex;
             image_properties->GetString(kImagePathNodeName, &image_path);
             image_properties->GetInteger(kImageIndexNodeName, &image_index);
             if (image_index >= 0 && image_index < kDefaultImagesCount) {
               user->SetImage(GetDefaultImage(image_index), image_index);
             } else if (image_index == User::kExternalImageIndex ||
                        image_index == User::kProfileImageIndex) {
               // Path may be empty for profile images (meaning that the image
               // hasn't been downloaded for the first time yet, in which case a
               // download will be scheduled for |kProfileImageDownloadDelayMs|
               // after user logs in).
               DCHECK(!image_path.empty() ||
                      image_index == User::kProfileImageIndex);
-              // Until image has been loaded, use a stub.
-              user->SetImage(GetDefaultImage(kStubDefaultImageIndex),
+              // Until image has been loaded, use a gray avatar.
+              user->SetImage(*ResourceBundle::GetSharedInstance().
+                                 GetBitmapNamed(IDR_PROFILE_PICTURE_LOADING),
                              image_index);
               if (!image_path.empty()) {
                 // Load user image asynchronously.
                 image_loader_->Start(
                     image_path, 0,
                     base::Bind(&UserManager::SetUserImage,
                                base::Unretained(this), email, image_index));
               }
             } else {
               NOTREACHED();
@@ skipping 269 matching lines @@
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email);
   user->set_oauth_token_status(GetUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos