diff options
25 files changed, 31 insertions, 10 deletions
diff --git a/chrome/app/theme/profile_avatar__ninja.png b/chrome/app/theme/profile_avatar__ninja.png Binary files differdeleted file mode 100644 index 3f4dbd3..0000000 --- a/chrome/app/theme/profile_avatar__ninja.png +++ /dev/null diff --git a/chrome/app/theme/profile_avatar_alien.png b/chrome/app/theme/profile_avatar_alien.png Binary files differnew file mode 100644 index 0000000..3802340 --- /dev/null +++ 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 Binary files differindex f2cdeb8..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 Binary files differnew file mode 100644 index 0000000..9357bed --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..4653480 --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..bdd487f --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..6f95f48 --- /dev/null +++ b/chrome/app/theme/profile_avatar_cupcake.png diff --git a/chrome/app/theme/profile_avatar_detective.png b/chrome/app/theme/profile_avatar_detective.png Binary files differdeleted file mode 100644 index 23d4786..0000000 --- a/chrome/app/theme/profile_avatar_detective.png +++ /dev/null diff --git a/chrome/app/theme/profile_avatar_dog.png b/chrome/app/theme/profile_avatar_dog.png Binary files differnew file mode 100644 index 0000000..94957aa --- /dev/null +++ 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 Binary files differindex 43d8ebd..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_generic.png b/chrome/app/theme/profile_avatar_generic.png Binary files differdeleted file mode 100644 index a764e40..0000000 --- a/chrome/app/theme/profile_avatar_generic.png +++ /dev/null diff --git a/chrome/app/theme/profile_avatar_generic_female.png b/chrome/app/theme/profile_avatar_generic_female.png Binary files differnew file mode 100644 index 0000000..5a4c6d3 --- /dev/null +++ b/chrome/app/theme/profile_avatar_generic_female.png diff --git a/chrome/app/theme/profile_avatar_generic_male.png b/chrome/app/theme/profile_avatar_generic_male.png Binary files differnew file mode 100644 index 0000000..fab628b --- /dev/null +++ b/chrome/app/theme/profile_avatar_generic_male.png diff --git a/chrome/app/theme/profile_avatar_horse.png b/chrome/app/theme/profile_avatar_horse.png Binary files differnew file mode 100644 index 0000000..30dff2b --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..b590d3e --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..a4ba4b1 --- /dev/null +++ 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 Binary files differnew file mode 100644 index 0000000..955f270 --- /dev/null +++ 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 Binary files differindex d1a0ffe..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 Binary files differindex 12c9f1d..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 Binary files differindex 7186c30..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 Binary files differnew file mode 100644 index 0000000..d7fba85 --- /dev/null +++ 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 Binary files differindex e6a4333..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 Binary files differindex 5f9f559..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 a05e577..16276ef 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -206,16 +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_secret_agent.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_2" file="profile_avatar_superhero.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_3" file="profile_avatar_volley_ball.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_4" file="profile_avatar_detective.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_5" file="profile_avatar__ninja.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_6" file="profile_avatar_awesome.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_7" file="profile_avatar_flower.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_8" file="profile_avatar_pizza.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_9" file="profile_avatar_soccer.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 efa3e64..32bf6d5 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -39,6 +39,16 @@ const int kDefaultAvatarIconResources[] = { IDR_PROFILE_AVATAR_7, IDR_PROFILE_AVATAR_8, IDR_PROFILE_AVATAR_9, + 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, }; const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources); |
