[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 585 matching lines @@
                   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) {
+            } else if (image_index == User::kExternalImageIndex) {
+              DCHECK(!image_path.empty());
+              // Until image has been loaded, use a stub.
+              user->SetImage(GetDefaultImage(kStubDefaultImageIndex),
+                             User::kExternalImageIndex);
+              // Load user image asynchronously.
+              image_loader_->Start(
+                  image_path, 0,
+                  base::Bind(&UserManager::SetUserImage,
+                             base::Unretained(this), email, image_index));
+            } else if (image_index == User::kProfileImageIndex) {
+              // Until image has been loaded, use the default gray avatar.

[whywhat, 2011/11/22 13:55:39]

Let's use gray avatar in both cases.

[Ivan Korotkov, 2011/11/22 15:11:07]

Makes sense.

+              user->SetImage(*ResourceBundle::GetSharedInstance().
+                                 GetBitmapNamed(IDR_PROFILE_PICTURE_LOADING),
+                             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),
-                             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 266 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