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

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

Issue 7148023: Add content-security-policy (CSP) to chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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/resources/flags.html » ('j') | chrome/browser/resources/flags.html » ('J')
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/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">
(...skipping 21 matching lines...) Expand all
32 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" /> 32 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" />
33 <if expr="os == 'darwin'"> 33 <if expr="os == 'darwin'">
34 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 34 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
35 </if> 35 </if>
36 <if expr="os != 'darwin'"> 36 <if expr="os != 'darwin'">
37 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 37 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
38 </if> 38 </if>
39 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />
40 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 40 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
41 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
42 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
42 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 43 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
43 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" /> 44 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" />
44 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" /> 45 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />
45 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 46 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
46 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" /> 47 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />
47 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 48 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
48 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 49 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
49 <include name="IDR_LOGIN_HTML" file="resources\login.html" flattenhtml="tr ue" type="BINDATA" /> 50 <include name="IDR_LOGIN_HTML" file="resources\login.html" flattenhtml="tr ue" type="BINDATA" />
50 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" /> 51 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" />
51 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 52 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <!-- Enterprise enrollment dialog --> 118 <!-- Enterprise enrollment dialog -->
118 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" /> 119 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 120 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
120 </if> 121 </if>
121 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 122 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
122 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 123 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
123 </if> 124 </if>
124 </includes> 125 </includes>
125 </release> 126 </release>
126 </grit> 127 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/flags.html » ('j') | chrome/browser/resources/flags.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698