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

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

Issue 10916283: mac: use png otr icon asset instead of pdf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
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" context="default_ 100_percent"> 4 <output filename="grit/theme_resources.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_map.cc" type="resource_map_source" co ntext="default_100_percent" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" co ntext="default_100_percent" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" con text="default_100_percent" />
9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" /> 9 <output filename="theme_resources_100_percent.pak" type="data_package" conte xt="default_100_percent" />
10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" /> 10 <output filename="theme_resources_200_percent.pak" type="data_package" conte xt="default_200_percent" />
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_DARK" file="om nibox_tts_dark.png" /> 513 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_DARK" file="om nibox_tts_dark.png" />
514 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="omnibox_tts_selected.png" /> 514 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file ="omnibox_tts_selected.png" />
515 <if expr="pp_ifdef('chromeos')"> 515 <if expr="pp_ifdef('chromeos')">
516 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_CURREN T" file="oobe_progress_dot_current.png" /> 516 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_CURREN T" file="oobe_progress_dot_current.png" />
517 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_EMPTY" file="oobe_progress_dot_empty.png" /> 517 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_EMPTY" file="oobe_progress_dot_empty.png" />
518 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_FILLED " file="oobe_progress_dot_filled.png" /> 518 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_DOT_FILLED " file="oobe_progress_dot_filled.png" />
519 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE" file ="oobe_progress_line.png" /> 519 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE" file ="oobe_progress_line.png" />
520 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_LEFT" file="oobe_progress_line_left.png" /> 520 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_LEFT" file="oobe_progress_line_left.png" />
521 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_RIGHT " file="oobe_progress_line_right.png" /> 521 <structure type="chrome_scaled_image" name="IDR_OOBE_PROGRESS_LINE_RIGHT " file="oobe_progress_line_right.png" />
522 </if> 522 </if>
523 <if expr="not pp_ifdef('toolkit_views')"> 523 <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
524 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon .png" /> 524 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="otr_icon .png" />
525 </if> 525 </if>
526 <if expr="pp_ifdef('toolkit_views')"> 526 <if expr="pp_ifdef('toolkit_views')">
527 <if expr="not pp_ifdef('use_ash')"> 527 <if expr="not pp_ifdef('use_ash')">
528 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" /> 528 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common /otr_icon.png" />
529 </if> 529 </if>
530 <if expr="pp_ifdef('use_ash')"> 530 <if expr="pp_ifdef('use_ash')">
531 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/o tr_icon.png" /> 531 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/o tr_icon.png" />
532 </if> 532 </if>
533 </if> 533 </if>
534 <if expr="is_macosx">
535 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_ icon.png" />
536 </if>
534 <if expr="context.startswith('default_')"> 537 <if expr="context.startswith('default_')">
535 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon.png" /> 538 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon.png" />
536 </if> 539 </if>
537 <if expr="not context.startswith('default_')"> 540 <if expr="not context.startswith('default_')">
538 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon_fullscreen.png" /> 541 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil e="otr_icon_fullscreen.png" />
539 </if> 542 </if>
540 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein fo_bad.png" /> 543 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein fo_bad.png" />
541 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pagei nfo_good.png" /> 544 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pagei nfo_good.png" />
542 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="pagei nfo_info.png" /> 545 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="pagei nfo_info.png" />
543 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MAJOR" fi le="pageinfo_warning_major.png" /> 546 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MAJOR" fi le="pageinfo_warning_major.png" />
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 <if expr="not is_macosx"> 915 <if expr="not is_macosx">
913 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" /> 916 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" />
914 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" /> 917 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" />
915 </if> 918 </if>
916 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" /> 919 <include name="IDR_WIZARD_ICON" file="chromium/wizard_icon.png" type="BI NDATA" />
917 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> 920 <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
918 </if> 921 </if>
919 </includes> 922 </includes>
920 </release> 923 </release>
921 </grit> 924 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698