summaryrefslogtreecommitdiffstats
path: root/chrome/common/common_resources.grd
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-31 20:41:14 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-31 20:41:14 +0000
commit5d9d12c06c3bcd820f08701bdb5996cb91d966fa (patch)
treeecca12d674176e0a87bad077a4be47c9a60b6cc0 /chrome/common/common_resources.grd
parent77e0acde52ef5b2470b5c417590725faa998d5ae (diff)
downloadchromium_src-5d9d12c06c3bcd820f08701bdb5996cb91d966fa.zip
chromium_src-5d9d12c06c3bcd820f08701bdb5996cb91d966fa.tar.gz
chromium_src-5d9d12c06c3bcd820f08701bdb5996cb91d966fa.tar.bz2
Apply content-security-policy to chrome://plugins page. This involves
converting all inline javascript to external .js files, since CSP can't determine whether inline script is legitimate or an XSS. We move the jstemplate_compiled.js file to the share resources directory, since several WEBUI components will need this, and update the compile.py script that produces it to write to this new location. We move the javascript out of plugins.html to plugins.js; note that the sections at line 130 and line 251 are new. Review URL: http://codereview.chromium.org/7086003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/common_resources.grd')
-rw-r--r--chrome/common/common_resources.grd2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
index a90b009..efc8179 100644
--- a/chrome/common/common_resources.grd
+++ b/chrome/common/common_resources.grd
@@ -12,7 +12,7 @@
<include name="IDR_EXTENSION_API_JSON" file="extensions\api\extension_api.json" type="BINDATA" />
<include name="IDR_I18N_PROCESS_JS" file="..\browser\resources\shared\js\i18n_process.js" type="BINDATA" />
<include name="IDR_I18N_TEMPLATE_JS" file="..\browser\resources\shared\js\i18n_template.js" type="BINDATA" />
- <include name="IDR_JSTEMPLATE_JS" file="..\third_party\jstemplate\jstemplate_compiled.js" type="BINDATA" />
+ <include name="IDR_JSTEMPLATE_JS" file="..\browser\resources\shared\js\jstemplate_compiled.js" type="BINDATA" />
<include name="IDR_WEB_APP_SCHEMA" file="web_app_schema.json" type="BINDATA" />
</includes>
</release>