summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_thread_impl.cc
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 21:59:03 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 21:59:03 +0000
commit4ae41b43366f0583307eb4fcbbf79729e768c67b (patch)
tree48c6bffc6b4ce8eee52d0bdbf7aea5168972211f /content/renderer/render_thread_impl.cc
parentdad50522aa53b69d74b5a0301c375ff4cd8c170c (diff)
downloadchromium_src-4ae41b43366f0583307eb4fcbbf79729e768c67b.zip
chromium_src-4ae41b43366f0583307eb4fcbbf79729e768c67b.tar.gz
chromium_src-4ae41b43366f0583307eb4fcbbf79729e768c67b.tar.bz2
Hide CSP 1.1 behind the "experimental webkit features" flag.
BUG=163876 Review URL: https://chromiumcodereview.appspot.com/11416315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.cc')
-rw-r--r--content/renderer/render_thread_impl.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 755a524..58e65d2 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -682,6 +682,9 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableCSSExclusions(
command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures));
+ WebRuntimeFeatures::enableExperimentalContentSecurityPolicyFeatures(
+ command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures));
+
FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized());
devtools_agent_message_filter_ = new DevToolsAgentFilter();