chrome/browser/browser_resources.grd - Issue 7277010: Apply CSP to about:conflicts page.

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 7277010: Apply CSP to about:conflicts page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 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

OLD	NEW
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/browser_resources.h" type="rc_header">	4 <output filename="grit/browser_resources.h" type="rc_header">

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

6 </output>	6 </output>

7 <output filename="browser_resources.pak" type="data_package" />	7 <output filename="browser_resources.pak" type="data_package" />

8 <output filename="browser_resources.rc" type="rc_all" />	8 <output filename="browser_resources.rc" type="rc_all" />

9 </outputs>	9 </outputs>

10 <release seq="1">	10 <release seq="1">

11 <includes>	11 <includes>

12 <if expr="is_win">	12 <if expr="is_win">

13 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" type="BINDATA" />	13 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

	14 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />

14 </if>	15 </if>

15 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />	16 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />

16 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />	17 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />

17 <if expr="is_posix and not is_macosx">	18 <if expr="is_posix and not is_macosx">

18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />	19 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />

19 </if>	20 </if>

20 <if expr="is_macosx">	21 <if expr="is_macosx">

21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />	22 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />

22 </if>	23 </if>

23 <if expr="is_win">	24 <if expr="is_win">

(...skipping 103 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
127 <!-- Enterprise enrollment dialog -->	128 <!-- Enterprise enrollment dialog -->

128 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />	129 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />

129 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />	130 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />

130 </if>	131 </if>

131 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">	132 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">

132 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />	133 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />

133 </if>	134 </if>

134 </includes>	135 </includes>

135 </release>	136 </release>

136 </grit>	137 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/about_conflicts.html » ('j') | chrome/browser/resources/about_conflicts.js » ('J')