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/WebPreferenceKeysPrivate.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/WebPreferenceKeysPrivate.h')
| -rw-r--r-- | WebKit/win/WebPreferenceKeysPrivate.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit/win/WebPreferenceKeysPrivate.h b/WebKit/win/WebPreferenceKeysPrivate.h index e0c2b6f..09aeaff 100644 --- a/WebKit/win/WebPreferenceKeysPrivate.h +++ b/WebKit/win/WebPreferenceKeysPrivate.h @@ -54,7 +54,6 @@ #define WebKitDatabasesEnabledPreferenceKey "WebKitDatabasesEnabled" #define WebKitLocalStorageEnabledPreferenceKey "WebKitLocalStorageEnabled" #define WebKitExperimentalNotificationsEnabledPreferenceKey "WebKitExperimentalNotificationsEnabled" -#define WebKitExperimentalWebSocketsEnabledPreferenceKey "WebKitExperimentalWebSocketsEnabled" #define WebKitAllowAnimatedImagesPreferenceKey "WebKitAllowAnimatedImagesPreferenceKey" #define WebKitAllowAnimatedImageLoopingPreferenceKey "WebKitAllowAnimatedImageLoopingPreferenceKey" #define WebKitDisplayImagesKey "WebKitDisplayImagesKey" @@ -129,6 +128,4 @@ #define WebKitUseHighResolutionTimersPreferenceKey "WebKitUseHighResolutionTimers" -#define WebKitPluginHalterEnabledPreferenceKey "WebKitPluginHalterEnabled" - #define WebKitPluginAllowedRunTimePreferenceKey "WebKitPluginAllowedRunTime" |