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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10574042: Merge 143074 - Make avatar images HiDPI. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/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.grd ('k') | chrome/browser/profiles/profile_info_cache.cc » ('j') | 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_standard.h" type="rc_header" context= "default_100_percent"> 4 <output filename="grit/theme_resources_standard.h" type="rc_header" context= "default_100_percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" context="default_100_percent" /> 7 <output filename="grit/theme_resources_standard_map.cc" type="resource_map_s ource" context="default_100_percent" />
8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" context="default_100_percent" /> 8 <output filename="grit/theme_resources_standard_map.h" type="resource_map_he ader" context="default_100_percent" />
9 <output filename="theme_resources_standard.pak" type="data_package" context= "default_100_percent" /> 9 <output filename="theme_resources_standard.pak" type="data_package" context= "default_100_percent" />
10 <output filename="theme_resources_2x.pak" type="data_package" context="defau lt_200_percent" /> 10 <output filename="theme_resources_2x.pak" type="data_package" context="defau lt_200_percent" />
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROU ND_L" file="ev_bubble_l.png" /> 183 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROU ND_L" file="ev_bubble_l.png" />
184 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROU ND_R" file="ev_bubble_r.png" /> 184 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EV_BUBBLE_BACKGROU ND_R" file="ev_bubble_r.png" />
185 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon.p ng" /> 185 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon.p ng" />
186 <if expr="context.startswith('default_')"> 186 <if expr="context.startswith('default_')">
187 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon.png" /> 187 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon.png" />
188 </if> 188 </if>
189 <if expr="not context.startswith('default_')"> 189 <if expr="not context.startswith('default_')">
190 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon_fullscreen.png" /> 190 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon_fullscreen.png" />
191 </if> 191 </if>
192 <structure type="chrome_scaled_image" name="IDR_PLUGIN" file="plugin.png" /> 192 <structure type="chrome_scaled_image" name="IDR_PLUGIN" file="plugin.png" />
193 <if expr="not is_macosx">
194 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file=" profile_avatar_generic.png" />
195 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file=" profile_avatar_generic_aqua.png" />
196 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file=" profile_avatar_generic_blue.png" />
197 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file=" profile_avatar_generic_green.png" />
198 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file=" profile_avatar_generic_orange.png" />
199 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file=" profile_avatar_generic_purple.png" />
200 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file=" profile_avatar_generic_red.png" />
201 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file=" profile_avatar_generic_yellow.png" />
202 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file=" profile_avatar_secret_agent.png" />
203 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file=" profile_avatar_superhero.png" />
204 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file= "profile_avatar_volley_ball.png" />
205 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file= "profile_avatar_businessman.png" />
206 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file= "profile_avatar_ninja.png" />
207 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file= "profile_avatar_alien.png" />
208 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file= "profile_avatar_awesome.png" />
209 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file= "profile_avatar_flower.png" />
210 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file= "profile_avatar_pizza.png" />
211 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "profile_avatar_soccer.png" />
212 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "profile_avatar_burger.png" />
213 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "profile_avatar_cat.png" />
214 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "profile_avatar_cupcake.png" />
215 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "profile_avatar_dog.png" />
216 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "profile_avatar_horse.png" />
217 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "profile_avatar_margarita.png" />
218 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "profile_avatar_note.png" />
219 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "profile_avatar_sun_cloud.png" />
220 </if>
221 <if expr="is_macosx">
222 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file=" profile_avatar_generic_mac.png" />
223 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file=" profile_avatar_generic_aqua_mac.png" />
224 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file=" profile_avatar_generic_blue_mac.png" />
225 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file=" profile_avatar_generic_green_mac.png" />
226 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file=" profile_avatar_generic_orange_mac.png" />
227 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file=" profile_avatar_generic_purple_mac.png" />
228 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file=" profile_avatar_generic_red_mac.png" />
229 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file=" profile_avatar_generic_yellow_mac.png" />
230 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file=" profile_avatar_secret_agent_mac.png" />
231 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file=" profile_avatar_superhero_mac.png" />
232 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file= "profile_avatar_volley_ball_mac.png" />
233 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file= "profile_avatar_businessman_mac.png" />
234 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file= "profile_avatar_ninja_mac.png" />
235 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file= "profile_avatar_alien_mac.png" />
236 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file= "profile_avatar_awesome_mac.png" />
237 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file= "profile_avatar_flower_mac.png" />
238 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file= "profile_avatar_pizza_mac.png" />
239 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file= "profile_avatar_soccer_mac.png" />
240 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file= "profile_avatar_burger_mac.png" />
241 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file= "profile_avatar_cat_mac.png" />
242 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file= "profile_avatar_cupcake_mac.png" />
243 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file= "profile_avatar_dog_mac.png" />
244 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file= "profile_avatar_horse_mac.png" />
245 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file= "profile_avatar_margarita_mac.png" />
246 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file= "profile_avatar_note_mac.png" />
247 <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file= "profile_avatar_sun_cloud_mac.png" />
248 </if>
193 <if expr="pp_ifdef('toolkit_views')"> 249 <if expr="pp_ifdef('toolkit_views')">
194 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="ash/browse r_reload_normal.png" /> 250 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="ash/browse r_reload_normal.png" />
195 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="ash/brow ser_reload_hover.png" /> 251 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="ash/brow ser_reload_hover.png" />
196 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="ash/brow ser_reload_pressed.png" /> 252 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="ash/brow ser_reload_pressed.png" />
197 </if> 253 </if>
198 <if expr="not pp_ifdef('toolkit_views')"> 254 <if expr="not pp_ifdef('toolkit_views')">
199 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png " /> 255 <structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png " />
200 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_h over.png" /> 256 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_h over.png" />
201 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="reload_p ressed.png" /> 257 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="reload_p ressed.png" />
202 </if> 258 </if>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 <if expr="not pp_ifdef('toolkit_views')"> 366 <if expr="not pp_ifdef('toolkit_views')">
311 <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" /> 367 <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" />
312 <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hov er.png" /> 368 <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hov er.png" />
313 <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pre ssed.png" /> 369 <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pre ssed.png" />
314 </if> 370 </if>
315 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 371 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
316 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 372 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
317 </structures> 373 </structures>
318 </release> 374 </release>
319 </grit> 375 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/profiles/profile_info_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698