| Index: webkit/glue/webpreferences.h
|
| diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
|
| index 1da5cc77d9b272d8e78e42ba0fb9033cac21e146..043adae02dcd61e3455f6c6cbb9c232da4538ead 100644
|
| --- a/webkit/glue/webpreferences.h
|
| +++ b/webkit/glue/webpreferences.h
|
| @@ -117,12 +117,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
|
| bool fullscreen_enabled;
|
| bool allow_displaying_insecure_content;
|
| bool allow_running_insecure_content;
|
| -#if defined(OS_ANDROID)
|
| - bool text_autosizing_enabled;
|
| - float font_scale_factor;
|
| - bool force_enable_zoom;
|
| - bool user_gesture_required_for_media_playback;
|
| -#endif
|
| bool password_echo_enabled;
|
| bool should_print_backgrounds;
|
| bool enable_scroll_animator;
|
| @@ -150,6 +144,14 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
|
|
|
| bool apply_page_scale_factor_in_compositor;
|
|
|
| +#if defined(OS_ANDROID)
|
| + bool text_autosizing_enabled;
|
| + float font_scale_factor;
|
| + bool force_enable_zoom;
|
| + bool user_gesture_required_for_media_playback;
|
| + bool supports_multiple_windows;
|
| +#endif
|
| +
|
| // We try to keep the default values the same as the default values in
|
| // chrome, except for the cases where it would require lots of extra work for
|
| // the embedder to use the same default value.
|
|
|