summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 18:38:55 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 18:38:55 +0000
commit4ecbbdfcbe7dfcc2013c6cf431fc9d4f25e21315 (patch)
treea74f1189e458eb345d3d548f2f41b1c747da30d2 /chrome/browser/browser_resources.grd
parentcafe4ad25440a7752f5a4d230adf29b16a4766b0 (diff)
downloadchromium_src-4ecbbdfcbe7dfcc2013c6cf431fc9d4f25e21315.zip
chromium_src-4ecbbdfcbe7dfcc2013c6cf431fc9d4f25e21315.tar.gz
chromium_src-4ecbbdfcbe7dfcc2013c6cf431fc9d4f25e21315.tar.bz2
Apply content-security-policy directive to chrome://tasks page.
Review URL: http://codereview.chromium.org/7482035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 262af1e..2f672ab 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -44,7 +44,9 @@
<include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_NEW_PROFILE_JS" file="resources\new_profile.js" type="BINDATA" />
<include name="IDR_NEW_PROFILE_HTML" file="resources\new_profile.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\includes.js" type="BINDATA" />
+ <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" type="BINDATA" />
<if expr="is_macosx">
<include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_infobar_mac.css" flattenhtml="true" type="BINDATA" />
</if>