summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 06:42:01 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 06:42:01 +0000
commitb1b1321e783506c11e306469179e8ae4830219d1 (patch)
tree5d744435b42d44224a2f9367ef0d4faba22dd4f5 /webkit/glue
parent3a075e1fe68e5b79607e4a39d68f0256671d92d1 (diff)
downloadchromium_src-b1b1321e783506c11e306469179e8ae4830219d1.zip
chromium_src-b1b1321e783506c11e306469179e8ae4830219d1.tar.gz
chromium_src-b1b1321e783506c11e306469179e8ae4830219d1.tar.bz2
Move various runtime enabled features into a WebRuntimeFeatures class.
There are separate functions to set/test each feature. R=jorlow BUG=25286 TEST=none Review URL: http://codereview.chromium.org/343001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webpreferences.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index cdb7260..0f17804 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -5,6 +5,7 @@
#include "webkit/glue/webpreferences.h"
#include "base/string_util.h"
+#include "webkit/api/public/WebRuntimeFeatures.h"
#include "webkit/api/public/WebKit.h"
#include "webkit/api/public/WebSettings.h"
#include "webkit/api/public/WebString.h"
@@ -12,6 +13,7 @@
#include "webkit/api/public/WebView.h"
#include "webkit/glue/webkit_glue.h"
+using WebKit::WebRuntimeFeatures;
using WebKit::WebSettings;
using WebKit::WebString;
using WebKit::WebURL;
@@ -50,7 +52,8 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setDownloadableBinaryFontsEnabled(remote_fonts_enabled);
settings->setXSSAuditorEnabled(xss_auditor_enabled);
settings->setLocalStorageEnabled(local_storage_enabled);
- settings->setDatabasesEnabled(WebKit::databasesEnabled() || databases_enabled);
+ settings->setDatabasesEnabled(
+ WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled);
settings->setSessionStorageEnabled(session_storage_enabled);
settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled);
settings->setExperimentalNotificationsEnabled(