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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browser_resources.grd » ('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" 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/b rowser_reload_pressed.png" /> 648 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/b rowser_reload_pressed.png" />
649 <structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="com mon/browser_reload_dimmed.png" /> 649 <structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="com mon/browser_reload_dimmed.png" />
650 </if> 650 </if>
651 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "restore_button_mask.png" /> 651 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "restore_button_mask.png" />
652 <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/ favicon_sad_tab.png" /> 652 <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/ favicon_sad_tab.png" />
653 <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" /> 653 <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" />
654 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file ="safebrowsing_warning.png" /> 654 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file ="safebrowsing_warning.png" />
655 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_ALERT " file="protector_search_alert.png" /> 655 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_ALERT " file="protector_search_alert.png" />
656 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_BADGE " file="protector_search_badge.png" /> 656 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_BADGE " file="protector_search_badge.png" />
657 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_MENU" file="protector_search_menu.png" /> 657 <structure type="chrome_scaled_image" name="IDR_SEARCH_ENGINE_CHANGE_MENU" file="protector_search_menu.png" />
658 <if expr="is_win"> 658 <if expr="pp_ifdef('enable_settings_app')">
659 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" f ile="settings_app_icon_128.png" /> 659 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" f ile="settings_app_icon_128.png" />
660 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" fi le="settings_app_icon_16.png" /> 660 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" fi le="settings_app_icon_16.png" />
661 </if> 661 </if>
662 <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="co mmon/favicon_settings.png" /> 662 <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="co mmon/favicon_settings.png" />
663 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_EMPTY" fi le="common/speech_input_mic_empty.png" /> 663 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_EMPTY" fi le="common/speech_input_mic_empty.png" />
664 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_FULL" fil e="common/speech_input_mic_full.png" /> 664 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_FULL" fil e="common/speech_input_mic_full.png" />
665 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_MASK" fil e="common/speech_input_mic_mask.png" /> 665 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_MASK" fil e="common/speech_input_mic_mask.png" />
666 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_NOISE" fi le="common/speech_input_mic_noise.png" /> 666 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_NOISE" fi le="common/speech_input_mic_noise.png" />
667 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_SPINNER" file ="common/speech_input_spinner.png" /> 667 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_SPINNER" file ="common/speech_input_spinner.png" />
668 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_BALLOON_ ICON" file="speech_input_tray_balloon_icon.png" /> 668 <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_BALLOON_ ICON" file="speech_input_tray_balloon_icon.png" />
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22_mono_invert.png" type="BINDATA" /> 920 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22_mono_invert.png" type="BINDATA" />
921 </if> 921 </if>
922 <if expr="not is_macosx"> 922 <if expr="not is_macosx">
923 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" /> 923 <include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.pn g" type="BINDATA" />
924 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" /> 924 <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_lo go_22.png" type="BINDATA" />
925 </if> 925 </if>
926 </if> 926 </if>
927 </includes> 927 </includes>
928 </release> 928 </release>
929 </grit> 929 </grit>
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698