Revert 95288 - Multi-Profiles: New Icon drop

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/7493082

TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/7562015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95289 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 23 insertions, 50 deletions

diff --git a/chrome/app/theme/profile_avatar_alien.png b/chrome/app/theme/profile_avatar_alien.png
index 73f7c54..3802340 100644
--- a/chrome/app/theme/profile_avatar_alien.png
+++ b/chrome/app/theme/profile_avatar_alien.png
diff --git a/chrome/app/theme/profile_avatar_awesome.png b/chrome/app/theme/profile_avatar_awesome.png
index faab29fa..ed92a6f 100644
--- a/chrome/app/theme/profile_avatar_awesome.png
+++ b/chrome/app/theme/profile_avatar_awesome.png
diff --git a/chrome/app/theme/profile_avatar_burger.png b/chrome/app/theme/profile_avatar_burger.png
index 71ef356..9357bed 100644
--- a/chrome/app/theme/profile_avatar_burger.png
+++ b/chrome/app/theme/profile_avatar_burger.png
diff --git a/chrome/app/theme/profile_avatar_businessman.png b/chrome/app/theme/profile_avatar_businessman.png
index 08cde48..4653480 100644
--- a/chrome/app/theme/profile_avatar_businessman.png
+++ b/chrome/app/theme/profile_avatar_businessman.png
diff --git a/chrome/app/theme/profile_avatar_cat.png b/chrome/app/theme/profile_avatar_cat.png
index 9b147f2..bdd487f 100644
--- a/chrome/app/theme/profile_avatar_cat.png
+++ b/chrome/app/theme/profile_avatar_cat.png
diff --git a/chrome/app/theme/profile_avatar_cupcake.png b/chrome/app/theme/profile_avatar_cupcake.png
index 5cc3614..6f95f48 100644
--- a/chrome/app/theme/profile_avatar_cupcake.png
+++ b/chrome/app/theme/profile_avatar_cupcake.png
diff --git a/chrome/app/theme/profile_avatar_dog.png b/chrome/app/theme/profile_avatar_dog.png
index f90a76a..94957aa 100644
--- a/chrome/app/theme/profile_avatar_dog.png
+++ b/chrome/app/theme/profile_avatar_dog.png
diff --git a/chrome/app/theme/profile_avatar_flower.png b/chrome/app/theme/profile_avatar_flower.png
index 4efa518..9c738bc 100644
--- a/chrome/app/theme/profile_avatar_flower.png
+++ b/chrome/app/theme/profile_avatar_flower.png
diff --git a/chrome/app/theme/profile_avatar_horse.png b/chrome/app/theme/profile_avatar_horse.png
index 1ca0a4a..30dff2b 100644
--- a/chrome/app/theme/profile_avatar_horse.png
+++ b/chrome/app/theme/profile_avatar_horse.png
diff --git a/chrome/app/theme/profile_avatar_margarita.png b/chrome/app/theme/profile_avatar_margarita.png
index 7d5e5d5..b590d3e 100644
--- a/chrome/app/theme/profile_avatar_margarita.png
+++ b/chrome/app/theme/profile_avatar_margarita.png
diff --git a/chrome/app/theme/profile_avatar_ninja.png b/chrome/app/theme/profile_avatar_ninja.png
index 06abe09..a4ba4b1 100644
--- a/chrome/app/theme/profile_avatar_ninja.png
+++ b/chrome/app/theme/profile_avatar_ninja.png
diff --git a/chrome/app/theme/profile_avatar_note.png b/chrome/app/theme/profile_avatar_note.png
index 3147a87..955f270 100644
--- a/chrome/app/theme/profile_avatar_note.png
+++ b/chrome/app/theme/profile_avatar_note.png
diff --git a/chrome/app/theme/profile_avatar_pizza.png b/chrome/app/theme/profile_avatar_pizza.png
index 3e598908..483bd4e 100644
--- a/chrome/app/theme/profile_avatar_pizza.png
+++ b/chrome/app/theme/profile_avatar_pizza.png
diff --git a/chrome/app/theme/profile_avatar_secret_agent.png b/chrome/app/theme/profile_avatar_secret_agent.png
index c544aac..876733a9 100644
--- a/chrome/app/theme/profile_avatar_secret_agent.png
+++ b/chrome/app/theme/profile_avatar_secret_agent.png
diff --git a/chrome/app/theme/profile_avatar_soccer.png b/chrome/app/theme/profile_avatar_soccer.png
index d9aaf80..49adc6d 100644
--- a/chrome/app/theme/profile_avatar_soccer.png
+++ b/chrome/app/theme/profile_avatar_soccer.png
diff --git a/chrome/app/theme/profile_avatar_sun_cloud.png b/chrome/app/theme/profile_avatar_sun_cloud.png
index 68aef0a..d7fba85 100644
--- a/chrome/app/theme/profile_avatar_sun_cloud.png
+++ b/chrome/app/theme/profile_avatar_sun_cloud.png
diff --git a/chrome/app/theme/profile_avatar_superhero.png b/chrome/app/theme/profile_avatar_superhero.png
index a8acb6c..d95a13d 100644
--- a/chrome/app/theme/profile_avatar_superhero.png
+++ b/chrome/app/theme/profile_avatar_superhero.png
diff --git a/chrome/app/theme/profile_avatar_volley_ball.png b/chrome/app/theme/profile_avatar_volley_ball.png
index d8c376f..93f7b20 100644
--- a/chrome/app/theme/profile_avatar_volley_ball.png
+++ b/chrome/app/theme/profile_avatar_volley_ball.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 0887162..16276ef 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -206,32 +206,27 @@
       <!-- NOTE: product_logo_*.* files beyond what's listed above are
            referenced by installer code; don't remove them unless you know what
            you're doing! -->
-      <include name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_aqua.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_2" file="profile_avatar_generic_blue.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_3" file="profile_avatar_generic_green.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_4" file="profile_avatar_generic_orange.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_5" file="profile_avatar_generic_purple.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_6" file="profile_avatar_generic_red.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_7" file="profile_avatar_generic_yellow.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_8" file="profile_avatar_secret_agent.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_9" file="profile_avatar_superhero.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_10" file="profile_avatar_volley_ball.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_11" file="profile_avatar_businessman.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_12" file="profile_avatar_ninja.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_13" file="profile_avatar_alien.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_14" file="profile_avatar_awesome.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_15" file="profile_avatar_flower.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note.png" type="BINDATA" />
-      <include name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic_male.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_female.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_2" file="profile_avatar_secret_agent.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_3" file="profile_avatar_superhero.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_4" file="profile_avatar_volley_ball.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_5" file="profile_avatar_businessman.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_6" file="profile_avatar_ninja.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_7" file="profile_avatar_alien.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_8" file="profile_avatar_awesome.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_9" file="profile_avatar_flower.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_10" file="profile_avatar_pizza.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_11" file="profile_avatar_soccer.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_12" file="profile_avatar_burger.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_13" file="profile_avatar_cat.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_14" file="profile_avatar_cupcake.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_15" file="profile_avatar_dog.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_16" file="profile_avatar_horse.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_17" file="profile_avatar_margarita.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_18" file="profile_avatar_note.png" type="BINDATA" />
+      <include name="IDR_PROFILE_AVATAR_19" file="profile_avatar_sun_cloud.png" type="BINDATA" />
+
       <include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" type="BINDATA" />
       <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
       <include name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" type="BINDATA" />
diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc
index d50e24e..32bf6d5 100644
--- a/chrome/browser/profiles/profile_info_cache.cc
+++ b/chrome/browser/profiles/profile_info_cache.cc
@@ -49,28 +49,10 @@ const int kDefaultAvatarIconResources[] = {
   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,
@@ -213,10 +195,6 @@ int ProfileInfoCache::ChooseAvatarIconIndexForNewProfile() {
        ++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) {
diff --git a/chrome/browser/ui/views/avatar_menu.cc b/chrome/browser/ui/views/avatar_menu.cc
index 8fdcb24..346f521 100644
--- a/chrome/browser/ui/views/avatar_menu.cc
+++ b/chrome/browser/ui/views/avatar_menu.cc
@@ -28,8 +28,8 @@
 
 namespace {
 
-const int kCellWidth = 38;
-const int kCellHeight = 31;
+const int kCellWidth = 32;
+const int kCellHeight = 32;
 const int kCellPaddingX = 5;
 const int kCellPaddingY = 5;
 const int kGridMaxCol = 3;