chrome/browser/resources/component_extension_resources.grd - Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines.

Side by Side Diff: chrome/browser/resources/component_extension_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 | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/options/options.html » ('j') | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. -->	3 without changes to the corresponding grd file. -->

4 <grit latest_public_release="0" current_release="1">	4 <grit latest_public_release="0" current_release="1">

5 <outputs>	5 <outputs>

6 <output filename="grit/component_extension_resources.h" type="rc_header">	6 <output filename="grit/component_extension_resources.h" type="rc_header">

7 <emit emit_type='prepend'></emit>	7 <emit emit_type='prepend'></emit>

8 </output>	8 </output>

9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />	9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />

10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />	10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 <include name="IDR_FILE_MANAGER_IMG_GALLERY_CURSOR_UPDOWN" file="file_ma nager/images/gallery/cursor_updown.png" type="BINDATA" />	96 <include name="IDR_FILE_MANAGER_IMG_GALLERY_CURSOR_UPDOWN" file="file_ma nager/images/gallery/cursor_updown.png" type="BINDATA" />

97	97

98 </if>	98 </if>

99 <if expr="pp_ifdef('chromeos')">	99 <if expr="pp_ifdef('chromeos')">

100 <include name="IDR_WALLPAPER_MANAGER_MAIN" file="chromeos/wallpaper_mana ger/main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	100 <include name="IDR_WALLPAPER_MANAGER_MAIN" file="chromeos/wallpaper_mana ger/main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

101 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />	101 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />

102 </if>	102 </if>

103 <include name="IDR_SCRIPT_BUBBLE_POPUP_HTML" file="script_bubble/popup.htm l" flattenhtml="false" type="BINDATA" />	103 <include name="IDR_SCRIPT_BUBBLE_POPUP_HTML" file="script_bubble/popup.htm l" flattenhtml="false" type="BINDATA" />

104 <include name="IDR_SCRIPT_BUBBLE_POPUP_JS" file="script_bubble/popup.js" f lattenhtml="false" type="BINDATA" />	104 <include name="IDR_SCRIPT_BUBBLE_POPUP_JS" file="script_bubble/popup.js" f lattenhtml="false" type="BINDATA" />

105 <include name="IDR_SCRIPT_BUBBLE_POPUP_ICON" file="script_bubble/16.png" f lattenhtml="false" type="BINDATA" />	105 <include name="IDR_SCRIPT_BUBBLE_POPUP_ICON" file="script_bubble/16.png" f lattenhtml="false" type="BINDATA" />

106 <if expr="is_win">	106 <if expr="pp_ifdef('enable_settings_app')">

107 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />	107 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />

108 </if>	108 </if>

109 </includes>	109 </includes>

110 </release>	110 </release>

111 </grit>	111 </grit>

OLD	NEW