diff options
author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKit/win/WebPreferences.h | |
parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKit/win/WebPreferences.h')
-rw-r--r-- | WebKit/win/WebPreferences.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebKit/win/WebPreferences.h b/WebKit/win/WebPreferences.h index 14035d0..2a89269 100644 --- a/WebKit/win/WebPreferences.h +++ b/WebKit/win/WebPreferences.h @@ -332,12 +332,6 @@ public: virtual HRESULT STDMETHODCALLTYPE setExperimentalNotificationsEnabled( /* [in] */ BOOL enabled); - virtual HRESULT STDMETHODCALLTYPE experimentalWebSocketsEnabled( - /* [retval][out] */ BOOL *enabled); - - virtual HRESULT STDMETHODCALLTYPE setExperimentalWebSocketsEnabled( - /* [in] */ BOOL enabled); - virtual HRESULT STDMETHODCALLTYPE setShouldPaintNativeControls( /* [in] */ BOOL shouldPaint); @@ -380,12 +374,6 @@ public: virtual HRESULT STDMETHODCALLTYPE shouldUseHighResolutionTimers( /* [retval][out] */ BOOL* useHighResolutionTimers); - virtual HRESULT STDMETHODCALLTYPE setPluginHalterEnabled( - /* [in] */ BOOL enabled); - - virtual HRESULT STDMETHODCALLTYPE pluginHalterEnabled( - /* [retval][out] */ BOOL* enabled); - virtual HRESULT STDMETHODCALLTYPE setPluginAllowedRunTime( /* [in] */ UINT allowedRunTime); |