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

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

Issue 8103008: Add content-security-policy directive to chrome://hung-renderer. WebUI pages should specify CSP ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/hung_renderer_dialog.html » ('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/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 24 matching lines...) Expand all
35 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 35 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
36 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 36 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
37 </if> 37 </if>
38 <include name="IDR_CONTENT_SECURITY_POLICY_HTML" file="resources\content_s ecurity_policy.html" type="BINDATA" /> 38 <include name="IDR_CONTENT_SECURITY_POLICY_HTML" file="resources\content_s ecurity_policy.html" type="BINDATA" />
39 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 39 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
40 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 40 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
41 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 41 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
42 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 42 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
43 <include name="IDR_DOWNLOADS_JS" file="resources\downloads.js" type="BINDA TA" /> 43 <include name="IDR_DOWNLOADS_JS" file="resources\downloads.js" type="BINDA TA" />
44 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" /> 44 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" />
45 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" type="BINDATA" /> 45 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
46 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" /> 46 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" />
47 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" /> 47 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" />
48 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 48 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
49 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" /> 49 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\ includes.js" type="BINDATA" />
50 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" type="BINDATA" /> 50 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" type="BINDATA" />
51 <if expr="is_macosx"> 51 <if expr="is_macosx">
52 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 52 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
53 </if> 53 </if>
54 <if expr="not is_macosx"> 54 <if expr="not is_macosx">
55 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 55 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 158 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
159 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 159 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
160 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" /> 160 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" />
161 </if> 161 </if>
162 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 162 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
163 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 163 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
164 </if> 164 </if>
165 </includes> 165 </includes>
166 </release> 166 </release>
167 </grit> 167 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/hung_renderer_dialog.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698