summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorantonm@google.com <antonm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:55:54 +0000
committerantonm@google.com <antonm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 17:55:54 +0000
commita4d0c7d2fa06be57cb732751d743f2bbae4c0019 (patch)
treed29bf09817959a1d8a9a6bd8333506f8a2962233 /webkit
parentf0ed8a2f0e95ab61f755f3f4c10b0cdd6007fe26 (diff)
downloadchromium_src-a4d0c7d2fa06be57cb732751d743f2bbae4c0019.zip
chromium_src-a4d0c7d2fa06be57cb732751d743f2bbae4c0019.tar.gz
chromium_src-a4d0c7d2fa06be57cb732751d743f2bbae4c0019.tar.bz2
Do not invoke setDartEnabled.
Currently Dart and JavaScript are either both enabled or both disabled. Review URL: http://codereview.chromium.org/9212003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc4
-rw-r--r--webkit/glue/webpreferences.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 9aba421..71808f4 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -38,7 +38,6 @@ WebPreferences::WebPreferences()
minimum_logical_font_size(6),
default_encoding("ISO-8859-1"),
javascript_enabled(true),
- dart_enabled(true),
web_security_enabled(true),
javascript_can_open_windows_automatically(true),
loads_images_automatically(true),
@@ -184,9 +183,6 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setMinimumLogicalFontSize(minimum_logical_font_size);
settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
settings->setJavaScriptEnabled(javascript_enabled);
-#if WEBKIT_USING_DART
- settings->setDartEnabled(dart_enabled);
-#endif
settings->setWebSecurityEnabled(web_security_enabled);
settings->setJavaScriptCanOpenWindowsAutomatically(
javascript_can_open_windows_automatically);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 8e8c23f..7d58641 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -45,7 +45,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
int minimum_logical_font_size;
std::string default_encoding;
bool javascript_enabled;
- bool dart_enabled;
bool web_security_enabled;
bool javascript_can_open_windows_automatically;
bool loads_images_automatically;