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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1367002: Revert 42665 - broke build as I missed a unit test when building locally.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | « no previous file | chrome/browser/content_setting_bubble_model.h » ('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.h" type="rc_header"> 4 <output filename="grit/theme_resources.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.rc" type="rc_all" /> 7 <output filename="theme_resources.rc" type="rc_all" />
8 <output filename="theme_resources.pak" type="data_package" /> 8 <output filename="theme_resources.pak" type="data_package" />
9 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 9 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 10 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" /> 324 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" />
325 <include name="IDR_BALLOON_OPTIONS_ARROW" file="balloon_options_arrow.png" type="BINDATA" /> 325 <include name="IDR_BALLOON_OPTIONS_ARROW" file="balloon_options_arrow.png" type="BINDATA" />
326 <include name="IDR_BALLOON_OPTIONS_ARROW_HOVER" file="balloon_options_arro w_hover.png" type="BINDATA" /> 326 <include name="IDR_BALLOON_OPTIONS_ARROW_HOVER" file="balloon_options_arro w_hover.png" type="BINDATA" />
327 327
328 <include name="IDR_SIDETABS_SHADOW_TOP" file="sidetabs_shadow_top.png" typ e="BINDATA" /> 328 <include name="IDR_SIDETABS_SHADOW_TOP" file="sidetabs_shadow_top.png" typ e="BINDATA" />
329 <include name="IDR_SIDETABS_SHADOW_MIDDLE" file="sidetabs_shadow_middle.pn g" type="BINDATA" /> 329 <include name="IDR_SIDETABS_SHADOW_MIDDLE" file="sidetabs_shadow_middle.pn g" type="BINDATA" />
330 <include name="IDR_SIDETABS_SHADOW_BOTTOM" file="sidetabs_shadow_bottom.pn g" type="BINDATA" /> 330 <include name="IDR_SIDETABS_SHADOW_BOTTOM" file="sidetabs_shadow_bottom.pn g" type="BINDATA" />
331 331
332 <!-- Geolocation --> 332 <!-- Geolocation -->
333 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_ico n.png" type="BINDATA" /> 333 <include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_ico n.png" type="BINDATA" />
334 <include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation _allowed_locationbar_icon.png" type="BINDATA" />
335 <include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_ denied_locationbar_icon.png" type="BINDATA" />
336 334
337 <if expr="pp_ifdef('_google_chrome')"> 335 <if expr="pp_ifdef('_google_chrome')">
338 <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_backgroun d.png" type="BINDATA" /> 336 <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_backgroun d.png" type="BINDATA" />
339 <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_backg round_rtl.png" type="BINDATA" /> 337 <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_backg round_rtl.png" type="BINDATA" />
340 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" /> 338 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" />
341 <include name="IDR_DISTRIBUTOR_LOGO" file="google_chrome/distributor_log o.png" type="BINDATA" /> 339 <include name="IDR_DISTRIBUTOR_LOGO" file="google_chrome/distributor_log o.png" type="BINDATA" />
342 <include name="IDR_DISTRIBUTOR_LOGO_LIGHT" file="google_chrome/distribut or_logo_light.png" type="BINDATA" /> 340 <include name="IDR_DISTRIBUTOR_LOGO_LIGHT" file="google_chrome/distribut or_logo_light.png" type="BINDATA" />
343 <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" t ype="BINDATA" /> 341 <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" t ype="BINDATA" />
344 <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_ white.png" type="BINDATA" /> 342 <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_ white.png" type="BINDATA" />
345 <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16. png" type="BINDATA" /> 343 <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16. png" type="BINDATA" />
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 486 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
489 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" /> 487 <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_inco gnito.png" type="BINDATA" />
490 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" /> 488 <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inact ive.png" type="BINDATA" />
491 </if> 489 </if>
492 490
493 </includes> 491 </includes>
494 </release> 492 </release>
495 </grit> 493 </grit>
496 494
497 495
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_setting_bubble_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698