diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-16 00:30:40 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-16 00:30:40 +0000 |
| commit | 85d63d28ae1ce458ecf694ab7333a9b3ba4fa7dd (patch) | |
| tree | 9180ceb4f297bf72e8cbbae9e847ea14c9a471ab | |
| parent | 1f528b557f829a838ffa0767a49ce5a55a0b2343 (diff) | |
| download | chromium_src-85d63d28ae1ce458ecf694ab7333a9b3ba4fa7dd.zip chromium_src-85d63d28ae1ce458ecf694ab7333a9b3ba4fa7dd.tar.gz chromium_src-85d63d28ae1ce458ecf694ab7333a9b3ba4fa7dd.tar.bz2 | |
Promote the content_security_policy manifest attribute out of experimental.
Review URL: http://codereview.chromium.org/7398008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92773 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/extension.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 767b1f2..ad676f1 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -2218,9 +2218,7 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags, } } - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableExperimentalExtensionApis) && - source.HasKey(keys::kContentSecurityPolicy)) { + if (source.HasKey(keys::kContentSecurityPolicy)) { std::string content_security_policy; if (!source.GetString(keys::kContentSecurityPolicy, &content_security_policy)) { |