diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 05:51:55 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 05:51:55 +0000 |
| commit | 3553c6cc33291037232c0b9b70f744ac5d2dc03c (patch) | |
| tree | ec043410391887b85abf89d49ed5031d2c9c4fcd /webkit/glue | |
| parent | bb9ef9a715df7ce9f0f9d9826a4d9c548c39e221 (diff) | |
| download | chromium_src-3553c6cc33291037232c0b9b70f744ac5d2dc03c.zip chromium_src-3553c6cc33291037232c0b9b70f744ac5d2dc03c.tar.gz chromium_src-3553c6cc33291037232c0b9b70f744ac5d2dc03c.tar.bz2 | |
add enableWebSockets in WebKit API
and remove experimentalWebSocketsEnabled from WebPreferences/Settings.
Patch for http://bugs.webkit.org/show_bug.cgi?id=29896 will remove Settings::experimentalWebSocketsEnabled(), so we need to remove it from WebPreferences too. This is because such configuration in Settings confuses other WebKit developers and such control is only required for chromium.
Instead add WebKit::enableWebSockets() in this change to
control WebSockets feature.
Review URL: http://codereview.chromium.org/292012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index df6610b..cdb7260 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -55,7 +55,6 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled); settings->setExperimentalNotificationsEnabled( experimental_notifications_enabled); - settings->setExperimentalWebSocketsEnabled(web_sockets_enabled); // This setting affects the behavior of links in an editable region: // clicking the link should select it rather than navigate to it. diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index b9d291d..0693fb9 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -51,7 +51,6 @@ struct WebPreferences { bool session_storage_enabled; bool application_cache_enabled; bool tabs_to_links; - bool web_sockets_enabled; // TODO(tc): User style sheets will not work in chrome because it tries to // load the style sheet using a request without a frame. @@ -98,7 +97,6 @@ struct WebPreferences { session_storage_enabled(false), application_cache_enabled(false), tabs_to_links(true), - web_sockets_enabled(false), user_style_sheet_enabled(false), allow_universal_access_from_file_urls(false), experimental_webgl_enabled(false), |