Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources_touch_2x.grd

Issue 10559029: 2x profile avatar icons (grd changes) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/theme_resources_touch_1x.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/theme_resources_touch_2x.h" type="rc_header"> 4 <output filename="grit/theme_resources_touch_2x.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="theme_resources_touch_2x.pak" type="data_package" /> 7 <output filename="theme_resources_touch_2x.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <includes> 10 <includes>
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" /> 159 <include name="IDR_NEWTAB_BUTTON_P" file="default_200_percent/newtab_pre ssed.png" type="BINDATA" />
160 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" /> 160 <include name="IDR_NEWTAB_BUTTON_MASK" file="default_200_percent/newtab_ button_mask.png" type="BINDATA" />
161 </if> 161 </if>
162 <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favi con.png" type="BINDATA" /> 162 <include name="IDR_SETTINGS_FAVICON" file="touch_100_percent/settings_favi con.png" type="BINDATA" />
163 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent /ev_bubble_c.png" type="BINDATA" /> 163 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="touch_100_percent /ev_bubble_c.png" type="BINDATA" />
164 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent /ev_bubble_l.png" type="BINDATA" /> 164 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="touch_100_percent /ev_bubble_l.png" type="BINDATA" />
165 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent /ev_bubble_r.png" type="BINDATA" /> 165 <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="touch_100_percent /ev_bubble_r.png" type="BINDATA" />
166 <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="B INDATA" /> 166 <include name="IDR_OTR_ICON" file="touch_100_percent/otr_icon.png" type="B INDATA" />
167 <include name="IDR_OTR_ICON_FULLSCREEN" file="touch_200_percent/otr_icon_f ullscreen.png" type="BINDATA" /> 167 <include name="IDR_OTR_ICON_FULLSCREEN" file="touch_200_percent/otr_icon_f ullscreen.png" type="BINDATA" />
168 <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDA TA" /> 168 <include name="IDR_PLUGIN" file="touch_100_percent/plugin.png" type="BINDA TA" />
169 <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
170 <include name="IDR_PROFILE_AVATAR_0" file="default_200_percent/profile_a vatar_generic.png" type="BINDATA" />
171 <include name="IDR_PROFILE_AVATAR_1" file="default_200_percent/profile_a vatar_generic_aqua.png" type="BINDATA" />
172 <include name="IDR_PROFILE_AVATAR_2" file="default_200_percent/profile_a vatar_generic_blue.png" type="BINDATA" />
173 <include name="IDR_PROFILE_AVATAR_3" file="default_200_percent/profile_a vatar_generic_green.png" type="BINDATA" />
174 <include name="IDR_PROFILE_AVATAR_4" file="default_200_percent/profile_a vatar_generic_orange.png" type="BINDATA" />
175 <include name="IDR_PROFILE_AVATAR_5" file="default_200_percent/profile_a vatar_generic_purple.png" type="BINDATA" />
176 <include name="IDR_PROFILE_AVATAR_6" file="default_200_percent/profile_a vatar_generic_red.png" type="BINDATA" />
177 <include name="IDR_PROFILE_AVATAR_7" file="default_200_percent/profile_a vatar_generic_yellow.png" type="BINDATA" />
178 <include name="IDR_PROFILE_AVATAR_8" file="default_200_percent/profile_a vatar_secret_agent.png" type="BINDATA" />
179 <include name="IDR_PROFILE_AVATAR_9" file="default_200_percent/profile_a vatar_superhero.png" type="BINDATA" />
180 <include name="IDR_PROFILE_AVATAR_10" file="default_200_percent/profile_ avatar_volley_ball.png" type="BINDATA" />
181 <include name="IDR_PROFILE_AVATAR_11" file="default_200_percent/profile_ avatar_businessman.png" type="BINDATA" />
182 <include name="IDR_PROFILE_AVATAR_12" file="default_200_percent/profile_ avatar_ninja.png" type="BINDATA" />
183 <include name="IDR_PROFILE_AVATAR_13" file="default_200_percent/profile_ avatar_alien.png" type="BINDATA" />
184 <include name="IDR_PROFILE_AVATAR_14" file="default_200_percent/profile_ avatar_awesome.png" type="BINDATA" />
185 <include name="IDR_PROFILE_AVATAR_15" file="default_200_percent/profile_ avatar_flower.png" type="BINDATA" />
186 <include name="IDR_PROFILE_AVATAR_16" file="default_200_percent/profile_ avatar_pizza.png" type="BINDATA" />
187 <include name="IDR_PROFILE_AVATAR_17" file="default_200_percent/profile_ avatar_soccer.png" type="BINDATA" />
188 <include name="IDR_PROFILE_AVATAR_18" file="default_200_percent/profile_ avatar_burger.png" type="BINDATA" />
189 <include name="IDR_PROFILE_AVATAR_19" file="default_200_percent/profile_ avatar_cat.png" type="BINDATA" />
190 <include name="IDR_PROFILE_AVATAR_20" file="default_200_percent/profile_ avatar_cupcake.png" type="BINDATA" />
191 <include name="IDR_PROFILE_AVATAR_21" file="default_200_percent/profile_ avatar_dog.png" type="BINDATA" />
192 <include name="IDR_PROFILE_AVATAR_22" file="default_200_percent/profile_ avatar_horse.png" type="BINDATA" />
193 <include name="IDR_PROFILE_AVATAR_23" file="default_200_percent/profile_ avatar_margarita.png" type="BINDATA" />
194 <include name="IDR_PROFILE_AVATAR_24" file="default_200_percent/profile_ avatar_note.png" type="BINDATA" />
195 <include name="IDR_PROFILE_AVATAR_25" file="default_200_percent/profile_ avatar_sun_cloud.png" type="BINDATA" />
196 </if>
197 <if expr="is_macosx">
198 <include name="IDR_PROFILE_AVATAR_0" file="default_200_percent/profile_a vatar_generic_mac.png" type="BINDATA" />
199 <include name="IDR_PROFILE_AVATAR_1" file="default_200_percent/profile_a vatar_generic_aqua_mac.png" type="BINDATA" />
200 <include name="IDR_PROFILE_AVATAR_2" file="default_200_percent/profile_a vatar_generic_blue_mac.png" type="BINDATA" />
201 <include name="IDR_PROFILE_AVATAR_3" file="default_200_percent/profile_a vatar_generic_green_mac.png" type="BINDATA" />
202 <include name="IDR_PROFILE_AVATAR_4" file="default_200_percent/profile_a vatar_generic_orange_mac.png" type="BINDATA" />
203 <include name="IDR_PROFILE_AVATAR_5" file="default_200_percent/profile_a vatar_generic_purple_mac.png" type="BINDATA" />
204 <include name="IDR_PROFILE_AVATAR_6" file="default_200_percent/profile_a vatar_generic_red_mac.png" type="BINDATA" />
205 <include name="IDR_PROFILE_AVATAR_7" file="default_200_percent/profile_a vatar_generic_yellow_mac.png" type="BINDATA" />
206 <include name="IDR_PROFILE_AVATAR_8" file="default_200_percent/profile_a vatar_secret_agent_mac.png" type="BINDATA" />
207 <include name="IDR_PROFILE_AVATAR_9" file="default_200_percent/profile_a vatar_superhero_mac.png" type="BINDATA" />
208 <include name="IDR_PROFILE_AVATAR_10" file="default_200_percent/profile_ avatar_volley_ball_mac.png" type="BINDATA" />
209 <include name="IDR_PROFILE_AVATAR_11" file="default_200_percent/profile_ avatar_businessman_mac.png" type="BINDATA" />
210 <include name="IDR_PROFILE_AVATAR_12" file="default_200_percent/profile_ avatar_ninja_mac.png" type="BINDATA" />
211 <include name="IDR_PROFILE_AVATAR_13" file="default_200_percent/profile_ avatar_alien_mac.png" type="BINDATA" />
212 <include name="IDR_PROFILE_AVATAR_14" file="default_200_percent/profile_ avatar_awesome_mac.png" type="BINDATA" />
213 <include name="IDR_PROFILE_AVATAR_15" file="default_200_percent/profile_ avatar_flower_mac.png" type="BINDATA" />
214 <include name="IDR_PROFILE_AVATAR_16" file="default_200_percent/profile_ avatar_pizza_mac.png" type="BINDATA" />
215 <include name="IDR_PROFILE_AVATAR_17" file="default_200_percent/profile_ avatar_soccer_mac.png" type="BINDATA" />
216 <include name="IDR_PROFILE_AVATAR_18" file="default_200_percent/profile_ avatar_burger_mac.png" type="BINDATA" />
217 <include name="IDR_PROFILE_AVATAR_19" file="default_200_percent/profile_ avatar_cat_mac.png" type="BINDATA" />
218 <include name="IDR_PROFILE_AVATAR_20" file="default_200_percent/profile_ avatar_cupcake_mac.png" type="BINDATA" />
219 <include name="IDR_PROFILE_AVATAR_21" file="default_200_percent/profile_ avatar_dog_mac.png" type="BINDATA" />
220 <include name="IDR_PROFILE_AVATAR_22" file="default_200_percent/profile_ avatar_horse_mac.png" type="BINDATA" />
221 <include name="IDR_PROFILE_AVATAR_23" file="default_200_percent/profile_ avatar_margarita_mac.png" type="BINDATA" />
222 <include name="IDR_PROFILE_AVATAR_24" file="default_200_percent/profile_ avatar_note_mac.png" type="BINDATA" />
223 <include name="IDR_PROFILE_AVATAR_25" file="default_200_percent/profile_ avatar_sun_cloud_mac.png" type="BINDATA" />
224 </if>
225
169 <if expr="pp_ifdef('toolkit_views')"> 226 <if expr="pp_ifdef('toolkit_views')">
170 <include name="IDR_RELOAD" file="touch_200_percent/ash/browser_reload_no rmal.png" type="BINDATA" /> 227 <include name="IDR_RELOAD" file="touch_200_percent/ash/browser_reload_no rmal.png" type="BINDATA" />
171 <include name="IDR_RELOAD_H" file="touch_200_percent/ash/browser_reload_ hover.png" type="BINDATA" /> 228 <include name="IDR_RELOAD_H" file="touch_200_percent/ash/browser_reload_ hover.png" type="BINDATA" />
172 <include name="IDR_RELOAD_P" file="touch_200_percent/ash/browser_reload_ pressed.png" type="BINDATA" /> 229 <include name="IDR_RELOAD_P" file="touch_200_percent/ash/browser_reload_ pressed.png" type="BINDATA" />
173 </if> 230 </if>
174 <if expr="not pp_ifdef('toolkit_views')"> 231 <if expr="not pp_ifdef('toolkit_views')">
175 <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="B INDATA" /> 232 <include name="IDR_RELOAD" file="default_200_percent/reload.png" type="B INDATA" />
176 <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" /> 233 <include name="IDR_RELOAD_H" file="default_200_percent/reload_hover.png" type="BINDATA" />
177 <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.pn g" type="BINDATA" /> 234 <include name="IDR_RELOAD_P" file="default_200_percent/reload_pressed.pn g" type="BINDATA" />
178 </if> 235 </if>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 <if expr="not pp_ifdef('toolkit_views')"> 343 <if expr="not pp_ifdef('toolkit_views')">
287 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" /> 344 <include name="IDR_TOOLS" file="default_200_percent/tools.png" type="BIN DATA" />
288 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" /> 345 <include name="IDR_TOOLS_H" file="default_200_percent/tools_hover.png" t ype="BINDATA" />
289 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" /> 346 <include name="IDR_TOOLS_P" file="default_200_percent/tools_pressed.png" type="BINDATA" />
290 </if> 347 </if>
291 <include name="IDR_ZOOM_MINUS" file="touch_200_percent/zoom_minus.png" typ e="BINDATA" /> 348 <include name="IDR_ZOOM_MINUS" file="touch_200_percent/zoom_minus.png" typ e="BINDATA" />
292 <include name="IDR_ZOOM_PLUS" file="touch_200_percent/zoom_plus.png" type= "BINDATA" /> 349 <include name="IDR_ZOOM_PLUS" file="touch_200_percent/zoom_plus.png" type= "BINDATA" />
293 </includes> 350 </includes>
294 </release> 351 </release>
295 </grit> 352 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_touch_1x.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698