Newly created profiles should have the grey silhouette as avatar.

chrome/browser/profiles/profile_info_cache.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/profiles/profile_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 71 matching lines @@
   IDR_PROFILE_AVATAR_16,
   IDR_PROFILE_AVATAR_17,
   IDR_PROFILE_AVATAR_18,
   IDR_PROFILE_AVATAR_19,
   IDR_PROFILE_AVATAR_20,
   IDR_PROFILE_AVATAR_21,
   IDR_PROFILE_AVATAR_22,
   IDR_PROFILE_AVATAR_23,
   IDR_PROFILE_AVATAR_24,
   IDR_PROFILE_AVATAR_25,
+  IDR_PROFILE_AVATAR_26,
 };
 
+// This avatar does not exist on the server, the high res copy is in the build.
+const char* kNoHighResAvatar = "NothingToDownload";
+
 // File names for the high-res avatar icon resources. In the same order as
 // the avatars in kDefaultAvatarIconResources.
 const char* kDefaultAvatarIconResourceFileNames[] = {
   "avatar_generic.png",
   "avatar_generic_aqua.png",
   "avatar_generic_blue.png",
   "avatar_generic_green.png",
   "avatar_generic_orange.png",
   "avatar_generic_purple.png",
   "avatar_generic_red.png",
   "avatar_generic_yellow.png",
   "avatar_secret_agent.png",
   "avatar_superhero.png",
   "avatar_volley_ball.png",
   "avatar_businessman.png",
   "avatar_ninja.png",
   "avatar_alien.png",
   "avatar_smiley.png",
   "avatar_flower.png",
   "avatar_pizza.png",
   "avatar_soccer.png",
   "avatar_burger.png",
   "avatar_cat.png",
   "avatar_cupcake.png",
   "avatar_dog.png",
   "avatar_horse.png",
   "avatar_margarita.png",
   "avatar_note.png",
   "avatar_sun_cloud.png",
+  kNoHighResAvatar,
 };
 
 const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
 
 // The first 8 icons are generic.
 const size_t kGenericIconCount = 8;
 
+// The avatar used as a placeholder (grey silhouette).
+const int kPlaceholderAvatarIcon = 26;
+
 // First eight are generic icons, which use IDS_NUMBERED_PROFILE_NAME.
 const int kDefaultNames[] = {
   IDS_DEFAULT_AVATAR_NAME_8,
   IDS_DEFAULT_AVATAR_NAME_9,
   IDS_DEFAULT_AVATAR_NAME_10,
   IDS_DEFAULT_AVATAR_NAME_11,
   IDS_DEFAULT_AVATAR_NAME_12,
   IDS_DEFAULT_AVATAR_NAME_13,
   IDS_DEFAULT_AVATAR_NAME_14,
   IDS_DEFAULT_AVATAR_NAME_15,
   IDS_DEFAULT_AVATAR_NAME_16,
   IDS_DEFAULT_AVATAR_NAME_17,
   IDS_DEFAULT_AVATAR_NAME_18,
   IDS_DEFAULT_AVATAR_NAME_19,
   IDS_DEFAULT_AVATAR_NAME_20,
   IDS_DEFAULT_AVATAR_NAME_21,
   IDS_DEFAULT_AVATAR_NAME_22,
   IDS_DEFAULT_AVATAR_NAME_23,
   IDS_DEFAULT_AVATAR_NAME_24,
-  IDS_DEFAULT_AVATAR_NAME_25
+  IDS_DEFAULT_AVATAR_NAME_25,
+  IDS_DEFAULT_AVATAR_NAME_26
 };
 
 typedef std::vector<unsigned char> ImageData;
 
 // Writes |data| to disk and takes ownership of the pointer. On completion
 // |success| is set to true on success and false on failure.
 void SaveBitmap(ImageData* data,
                 const base::FilePath& image_path,
                 bool* success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 297 matching lines @@
 
   base::FilePath image_path = path.AppendASCII(file_name);
   return LoadAvatarPictureFromPath(key, image_path);
 }
 
 const gfx::Image* ProfileInfoCache::GetHighResAvatarOfProfileAtIndex(
     size_t index) const {
   int avatar_index = GetAvatarIconIndexOfProfileAtIndex(index);
   std::string key = kDefaultAvatarIconResourceFileNames[avatar_index];
 
+  if (!strcmp(key.c_str(), kNoHighResAvatar))
+    return NULL;
+
   base::FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   base::FilePath image_path =
       user_data_dir.AppendASCII(kHighResAvatarFolderName).AppendASCII(key);
   return LoadAvatarPictureFromPath(key, image_path);
 }
 
 const gfx::Image* ProfileInfoCache::LoadAvatarPictureFromPath(
     const std::string& key,
     const base::FilePath& image_path) const {
@@ skipping 446 matching lines @@
 
 const base::FilePath& ProfileInfoCache::GetUserDataDir() const {
   return user_data_dir_;
 }
 
 // static
 size_t ProfileInfoCache::GetDefaultAvatarIconCount() {
   return kDefaultAvatarIconsCount;
 }
 
+
+int ProfileInfoCache::GetPlaceholderAvatarIndex() {
+  return kPlaceholderAvatarIcon;
+}
+
+int ProfileInfoCache::GetPlaceholderAvatarIconResourceID() {
+  return IDR_PROFILE_AVATAR_26;
+}
+
 // static
 int ProfileInfoCache::GetDefaultAvatarIconResourceIDAtIndex(size_t index) {
   DCHECK(IsDefaultAvatarIconIndex(index));
   return kDefaultAvatarIconResources[index];
 }
 
 // static
 std::string ProfileInfoCache::GetDefaultAvatarIconUrl(size_t index) {
   DCHECK(IsDefaultAvatarIconIndex(index));
   return base::StringPrintf("%s%" PRIuS, kDefaultUrlPrefix, index);
@@ skipping 110 matching lines @@
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }