summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/options/options.html
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 17:41:11 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 17:41:11 +0000
commit323088387fdb3d3debe60c0280b99cdc18803819 (patch)
tree616cea7bca0672cf823c91ae483ba6f35d47f56a /chrome/browser/resources/options/options.html
parentd6ec8e0f92b784d359c0d0d90f5d139eb30ea5ad (diff)
downloadchromium_src-323088387fdb3d3debe60c0280b99cdc18803819.zip
chromium_src-323088387fdb3d3debe60c0280b99cdc18803819.tar.gz
chromium_src-323088387fdb3d3debe60c0280b99cdc18803819.tar.bz2
Consolidate content-security-policy markup for chrome:// pages into a single file, and have grit preprocess it into all the places it belongs. Also add to resource bundle so that the about handler can return the same thing.
Review URL: http://codereview.chromium.org/7396026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options/options.html')
-rw-r--r--chrome/browser/resources/options/options.html10
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 6364b32..68c906f 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -2,15 +2,7 @@
<html id="t" i18n-values="dir:textdirection">
<head>
<meta charset="utf-8">
-<!-- X-WebKit-CSP is our development name for Content-Security-Policy.
- TODO(tsepez) rename when Content-security-policy is done.
- TODO(tsepez) remove unsafe-eval when bidichecker_packaged.js fixed.
--->
-<meta http-equiv="X-WebKit-CSP"
- content="object-src 'none';
- script-src chrome://resources
- chrome-extension://mndnfokpggljbaajbnioimlmbfngpief
- 'self' 'unsafe-eval'">
+<include src="../content_security_policy.html"/>
<!-- Set the title to that of the default page so that the title doesn't flash
on load (for the most common case). -->
<title i18n-content="browserPageTabTitle"></title>