diff options
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 56 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources_standard.grd | 56 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_info_cache.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_info_util_unittest.cc | 4 |
4 files changed, 59 insertions, 59 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 6768885..db92fe9 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -216,6 +216,62 @@ <!-- 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! --> + <if expr="not is_macosx"> + <include name="IDR_PROFILE_AVATAR_0" file="default_100_percent/profile_avatar_generic.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_1" file="default_100_percent/profile_avatar_generic_aqua.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_2" file="default_100_percent/profile_avatar_generic_blue.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_3" file="default_100_percent/profile_avatar_generic_green.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_4" file="default_100_percent/profile_avatar_generic_orange.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_5" file="default_100_percent/profile_avatar_generic_purple.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_6" file="default_100_percent/profile_avatar_generic_red.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_7" file="default_100_percent/profile_avatar_generic_yellow.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_8" file="default_100_percent/profile_avatar_secret_agent.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_9" file="default_100_percent/profile_avatar_superhero.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_10" file="default_100_percent/profile_avatar_volley_ball.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_11" file="default_100_percent/profile_avatar_businessman.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_12" file="default_100_percent/profile_avatar_ninja.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_13" file="default_100_percent/profile_avatar_alien.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_14" file="default_100_percent/profile_avatar_awesome.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_15" file="default_100_percent/profile_avatar_flower.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_16" file="default_100_percent/profile_avatar_pizza.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_17" file="default_100_percent/profile_avatar_soccer.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_18" file="default_100_percent/profile_avatar_burger.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_19" file="default_100_percent/profile_avatar_cat.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_20" file="default_100_percent/profile_avatar_cupcake.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_21" file="default_100_percent/profile_avatar_dog.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_22" file="default_100_percent/profile_avatar_horse.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_23" file="default_100_percent/profile_avatar_margarita.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_24" file="default_100_percent/profile_avatar_note.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_25" file="default_100_percent/profile_avatar_sun_cloud.png" type="BINDATA" /> + </if> + <if expr="is_macosx"> + <include name="IDR_PROFILE_AVATAR_0" file="default_100_percent/profile_avatar_generic_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_1" file="default_100_percent/profile_avatar_generic_aqua_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_2" file="default_100_percent/profile_avatar_generic_blue_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_3" file="default_100_percent/profile_avatar_generic_green_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_4" file="default_100_percent/profile_avatar_generic_orange_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_5" file="default_100_percent/profile_avatar_generic_purple_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_6" file="default_100_percent/profile_avatar_generic_red_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_7" file="default_100_percent/profile_avatar_generic_yellow_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_8" file="default_100_percent/profile_avatar_secret_agent_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_9" file="default_100_percent/profile_avatar_superhero_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_10" file="default_100_percent/profile_avatar_volley_ball_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_11" file="default_100_percent/profile_avatar_businessman_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_12" file="default_100_percent/profile_avatar_ninja_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_13" file="default_100_percent/profile_avatar_alien_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_14" file="default_100_percent/profile_avatar_awesome_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_15" file="default_100_percent/profile_avatar_flower_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_16" file="default_100_percent/profile_avatar_pizza_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_17" file="default_100_percent/profile_avatar_soccer_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_18" file="default_100_percent/profile_avatar_burger_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_19" file="default_100_percent/profile_avatar_cat_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_20" file="default_100_percent/profile_avatar_cupcake_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_21" file="default_100_percent/profile_avatar_dog_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_22" file="default_100_percent/profile_avatar_horse_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_23" file="default_100_percent/profile_avatar_margarita_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_24" file="default_100_percent/profile_avatar_note_mac.png" type="BINDATA" /> + <include name="IDR_PROFILE_AVATAR_25" file="default_100_percent/profile_avatar_sun_cloud_mac.png" type="BINDATA" /> + </if> <include name="IDR_PROFILE_EDIT" file="default_100_percent/profile_edit.png" type="BINDATA" /> <include name="IDR_PROFILE_EDIT_HOVER" file="default_100_percent/profile_edit_hover.png" type="BINDATA" /> <include name="IDR_PROFILE_EDIT_PRESSED" file="default_100_percent/profile_edit_pressed.png" type="BINDATA" /> diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd index c929cb7..bfb51222 100644 --- a/chrome/app/theme/theme_resources_standard.grd +++ b/chrome/app/theme/theme_resources_standard.grd @@ -190,62 +190,6 @@ <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon_fullscreen.png" /> </if> <structure type="chrome_scaled_image" name="IDR_PLUGIN" file="plugin.png" /> - <if expr="not is_macosx"> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_aqua.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="profile_avatar_generic_blue.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="profile_avatar_generic_green.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="profile_avatar_generic_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="profile_avatar_generic_purple.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="profile_avatar_generic_red.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="profile_avatar_generic_yellow.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="profile_avatar_secret_agent.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="profile_avatar_superhero.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="profile_avatar_volley_ball.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="profile_avatar_businessman.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="profile_avatar_ninja.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="profile_avatar_alien.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="profile_avatar_awesome.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="profile_avatar_flower.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud.png" /> - </if> - <if expr="is_macosx"> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_aqua_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="profile_avatar_generic_blue_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="profile_avatar_generic_green_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="profile_avatar_generic_orange_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="profile_avatar_generic_purple_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="profile_avatar_generic_red_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="profile_avatar_generic_yellow_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="profile_avatar_secret_agent_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="profile_avatar_superhero_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="profile_avatar_volley_ball_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="profile_avatar_businessman_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="profile_avatar_ninja_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="profile_avatar_alien_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="profile_avatar_awesome_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="profile_avatar_flower_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud_mac.png" /> - </if> <if expr="pp_ifdef('toolkit_views')"> <structure type="chrome_scaled_image" name="IDR_RELOAD" file="ash/browser_reload_normal.png" /> <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="ash/browser_reload_hover.png" /> diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index 1885d4e..347254d 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -25,7 +25,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" -#include "grit/theme_resources_standard.h" +#include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/profiles/profile_info_util_unittest.cc b/chrome/browser/profiles/profile_info_util_unittest.cc index 3d959df..0f291ac 100644 --- a/chrome/browser/profiles/profile_info_util_unittest.cc +++ b/chrome/browser/profiles/profile_info_util_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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_util.h" #include "grit/generated_resources.h" -#include "grit/theme_resources_standard.h" +#include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_unittest_util.h" |