diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:41:46 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:41:46 +0000 |
| commit | 7284a4e6d60eb4cd59fff8923b1a616bde1d50c2 (patch) | |
| tree | 8fb12a69b69a71bc57442cb4333f228f09da6aa6 /chrome/browser/browser_resources.grd | |
| parent | 7b7985a80e15435b96a2e2229654d463f8416efe (diff) | |
| download | chromium_src-7284a4e6d60eb4cd59fff8923b1a616bde1d50c2.zip chromium_src-7284a4e6d60eb4cd59fff8923b1a616bde1d50c2.tar.gz chromium_src-7284a4e6d60eb4cd59fff8923b1a616bde1d50c2.tar.bz2 | |
Apply CSP to about:conflicts page.
Review URL: http://codereview.chromium.org/7277010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 406c3ed..ad9efec0 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -10,7 +10,8 @@ <release seq="1"> <includes> <if expr="is_win"> - <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.js" type="BINDATA" /> </if> <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> |