Index: chrome/app/theme/theme_resources_touch_2x.grd |
diff --git a/chrome/app/theme/theme_resources_touch_2x.grd b/chrome/app/theme/theme_resources_touch_2x.grd |
index 26a148d8e7787029c638e31d35584f694f843663..8de61f634fd222030f0f4d4816b1e98600f6ae5e 100644 |
--- a/chrome/app/theme/theme_resources_touch_2x.grd |
+++ b/chrome/app/theme/theme_resources_touch_2x.grd |
@@ -166,6 +166,63 @@ |
<include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="BINDATA" /> |
<include name="IDR_OTR_ICON_FULLSCREEN" file="touch_200_percent/otr_icon_fullscreen.png" type="BINDATA" /> |
<include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDATA" /> |
+ <if expr="not is_macosx"> |
Nico
2012/06/18 06:12:16
I think you can assume "not mac" in _touch.grd, do
sail
2012/06/18 11:32:50
Unfortunately all the conditionals in the GRD file
|
+ <include name="IDR_PROFILE_AVATAR_0" file="default_200_percent/profile_avatar_generic.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_1" file="default_200_percent/profile_avatar_generic_aqua.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_2" file="default_200_percent/profile_avatar_generic_blue.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_3" file="default_200_percent/profile_avatar_generic_green.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_4" file="default_200_percent/profile_avatar_generic_orange.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_5" file="default_200_percent/profile_avatar_generic_purple.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_6" file="default_200_percent/profile_avatar_generic_red.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_7" file="default_200_percent/profile_avatar_generic_yellow.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_8" file="default_200_percent/profile_avatar_secret_agent.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_9" file="default_200_percent/profile_avatar_superhero.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_10" file="default_200_percent/profile_avatar_volley_ball.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_11" file="default_200_percent/profile_avatar_businessman.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_12" file="default_200_percent/profile_avatar_ninja.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_13" file="default_200_percent/profile_avatar_alien.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_14" file="default_200_percent/profile_avatar_awesome.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_15" file="default_200_percent/profile_avatar_flower.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_16" file="default_200_percent/profile_avatar_pizza.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_17" file="default_200_percent/profile_avatar_soccer.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_18" file="default_200_percent/profile_avatar_burger.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_19" file="default_200_percent/profile_avatar_cat.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_20" file="default_200_percent/profile_avatar_cupcake.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_21" file="default_200_percent/profile_avatar_dog.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_22" file="default_200_percent/profile_avatar_horse.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_23" file="default_200_percent/profile_avatar_margarita.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_24" file="default_200_percent/profile_avatar_note.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_25" file="default_200_percent/profile_avatar_sun_cloud.png" type="BINDATA" /> |
+ </if> |
+ <if expr="is_macosx"> |
+ <include name="IDR_PROFILE_AVATAR_0" file="default_200_percent/profile_avatar_generic_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_1" file="default_200_percent/profile_avatar_generic_aqua_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_2" file="default_200_percent/profile_avatar_generic_blue_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_3" file="default_200_percent/profile_avatar_generic_green_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_4" file="default_200_percent/profile_avatar_generic_orange_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_5" file="default_200_percent/profile_avatar_generic_purple_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_6" file="default_200_percent/profile_avatar_generic_red_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_7" file="default_200_percent/profile_avatar_generic_yellow_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_8" file="default_200_percent/profile_avatar_secret_agent_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_9" file="default_200_percent/profile_avatar_superhero_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_10" file="default_200_percent/profile_avatar_volley_ball_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_11" file="default_200_percent/profile_avatar_businessman_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_12" file="default_200_percent/profile_avatar_ninja_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_13" file="default_200_percent/profile_avatar_alien_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_14" file="default_200_percent/profile_avatar_awesome_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_15" file="default_200_percent/profile_avatar_flower_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_16" file="default_200_percent/profile_avatar_pizza_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_17" file="default_200_percent/profile_avatar_soccer_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_18" file="default_200_percent/profile_avatar_burger_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_19" file="default_200_percent/profile_avatar_cat_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_20" file="default_200_percent/profile_avatar_cupcake_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_21" file="default_200_percent/profile_avatar_dog_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_22" file="default_200_percent/profile_avatar_horse_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_23" file="default_200_percent/profile_avatar_margarita_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_24" file="default_200_percent/profile_avatar_note_mac.png" type="BINDATA" /> |
+ <include name="IDR_PROFILE_AVATAR_25" file="default_200_percent/profile_avatar_sun_cloud_mac.png" type="BINDATA" /> |
+ </if> |
+ |
<if expr="pp_ifdef('toolkit_views')"> |
<include name="IDR_RELOAD" file="touch_200_percent/ash/browser_reload_normal.png" type="BINDATA" /> |
<include name="IDR_RELOAD_H" file="touch_200_percent/ash/browser_reload_hover.png" type="BINDATA" /> |