summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 18:05:11 +0000
committerjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 18:05:11 +0000
commit2aac7ffd05fb6636e80cae767c67949299b3a957 (patch)
tree0381c6e2d06a16ef07dce46b3bb592dc6447854a /webkit
parent6863896f0ebd9018104efbfac39ba0fde7c3703a (diff)
downloadchromium_src-2aac7ffd05fb6636e80cae767c67949299b3a957.zip
chromium_src-2aac7ffd05fb6636e80cae767c67949299b3a957.tar.gz
chromium_src-2aac7ffd05fb6636e80cae767c67949299b3a957.tar.bz2
Disallow WebSQL and localStorage in platform apps.
BUG=none TEST=PlatformAppBrowserTest.DisallowStorage Review URL: http://codereview.chromium.org/9192021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 71808f4..8d807e2 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -207,8 +207,7 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setXSSAuditorEnabled(xss_auditor_enabled);
settings->setDNSPrefetchingEnabled(dns_prefetching_enabled);
settings->setLocalStorageEnabled(local_storage_enabled);
- WebRuntimeFeatures::enableDatabase(
- WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled);
+ WebRuntimeFeatures::enableDatabase(databases_enabled);
settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
settings->setCaretBrowsingEnabled(caret_browsing_enabled);
settings->setHyperlinkAuditingEnabled(hyperlink_auditing_enabled);