Multi-Profiles: New Icon drop

chrome/browser/profiles/profile_info_cache.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/profiles/profile_info_cache.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
@@ skipping 31 matching lines @@
   IDR_PROFILE_AVATAR_10,
   IDR_PROFILE_AVATAR_11,
   IDR_PROFILE_AVATAR_12,
   IDR_PROFILE_AVATAR_13,
   IDR_PROFILE_AVATAR_14,
   IDR_PROFILE_AVATAR_15,
   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,
 };
 
 const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
 
+// Returns true if the resource ID belongs to a generic avatar icon.
+bool IsAvatarIconGeneric(int icon_id) {
+  return icon_id == IDR_PROFILE_AVATAR_0 ||
+         icon_id == IDR_PROFILE_AVATAR_1 ||
+         icon_id == IDR_PROFILE_AVATAR_2 ||
+         icon_id == IDR_PROFILE_AVATAR_3 ||
+         icon_id == IDR_PROFILE_AVATAR_4 ||
+         icon_id == IDR_PROFILE_AVATAR_5 ||
+         icon_id == IDR_PROFILE_AVATAR_6 ||
+         icon_id == IDR_PROFILE_AVATAR_7;
+}
+
 } // namespace
 
 ProfileInfoCache::ProfileInfoCache(PrefService* prefs,
                                    const FilePath& user_data_dir)
     : prefs_(prefs),
       user_data_dir_(user_data_dir) {
   // Populate the cache
   const DictionaryValue* cache =
       prefs_->GetDictionary(prefs::kProfileInfoCache);
   for (DictionaryValue::key_iterator it = cache->begin_keys();
@@ skipping 122 matching lines @@
   }
 }
 
 int ProfileInfoCache::ChooseAvatarIconIndexForNewProfile() {
   // Start with a random icon to introduce variety.
   size_t rand_start_index = base::RandInt(0, GetDefaultAvatarIconCount() - 1);
   for (size_t icon_index = 0; icon_index < GetDefaultAvatarIconCount();
        ++icon_index) {
     size_t rand_icon_index =
         (icon_index + rand_start_index) % GetDefaultAvatarIconCount();
+    if (IsAvatarIconGeneric(GetDefaultAvatarIconResourceIDAtIndex(
+        rand_icon_index)))
+      continue;
+
     bool icon_found = false;
     for (size_t i = 0; i < GetNumberOfProfiles(); ++i) {
       if (GetAvatarIconIndexOfProfileAtIndex(i) == rand_icon_index) {
         icon_found = true;
         break;
       }
     }
     if (!icon_found)
       return rand_icon_index;
   }
@@ skipping 85 matching lines @@
       if (key_compare < 0)
         return sorted_keys_.begin() + i;
     }
   }
   return sorted_keys_.end();
 }
 
 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }