[Android] Add supportMultipleWindows setting

webkit/glue/webpreferences.cc

Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 757807adbd99e6ee2fd8eaf604684d7195e5ef26..df63bae1ca83bd023603ebe35cc35dbcb553af02 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -99,12 +99,6 @@ WebPreferences::WebPreferences()
       fullscreen_enabled(false),
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
-#if defined(OS_ANDROID)
-      text_autosizing_enabled(true),
-      font_scale_factor(1.0f),
-      force_enable_zoom(false),
-      user_gesture_required_for_media_playback(true),
-#endif
       password_echo_enabled(false),
       should_print_backgrounds(false),
       enable_scroll_animator(false),
@@ -123,7 +117,16 @@ WebPreferences::WebPreferences()
       sync_xhr_in_documents_enabled(true),
       number_of_cpu_cores(1),
       cookie_enabled(true),
-      apply_page_scale_factor_in_compositor(false) {
+      apply_page_scale_factor_in_compositor(false)
+#if defined(OS_ANDROID)
+      ,
+      text_autosizing_enabled(true),
+      font_scale_factor(1.0f),
+      force_enable_zoom(false),
+      user_gesture_required_for_media_playback(true),
+      supports_multiple_windows(true)
+#endif
+{
   standard_font_family_map[kCommonScript] =
       ASCIIToUTF16("Times New Roman");
   fixed_font_family_map[kCommonScript] =
@@ -409,15 +412,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setFullScreenEnabled(fullscreen_enabled);
   settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
   settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
-#if defined(OS_ANDROID)
-  settings->setTextAutosizingEnabled(text_autosizing_enabled);
-  settings->setTextAutosizingFontScaleFactor(font_scale_factor);
-  web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
-  settings->setAutoZoomFocusedNodeToLegibleScale(true);
-  settings->setDoubleTapToZoomEnabled(true);
-  settings->setMediaPlaybackRequiresUserGesture(
-      user_gesture_required_for_media_playback);
-#endif
   settings->setPasswordEchoEnabled(password_echo_enabled);
   settings->setShouldPrintBackgrounds(should_print_backgrounds);
   settings->setEnableScrollAnimator(enable_scroll_animator);
@@ -442,6 +436,17 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setApplyPageScaleFactorInCompositor(
       apply_page_scale_factor_in_compositor);
 
+#if defined(OS_ANDROID)
+  settings->setTextAutosizingEnabled(text_autosizing_enabled);
+  settings->setTextAutosizingFontScaleFactor(font_scale_factor);
+  web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
+  settings->setAutoZoomFocusedNodeToLegibleScale(true);
+  settings->setDoubleTapToZoomEnabled(true);
+  settings->setMediaPlaybackRequiresUserGesture(
+      user_gesture_required_for_media_playback);
+  settings->setSupportsMultipleWindows(supports_multiple_windows);
+#endif
+
   WebNetworkStateNotifier::setOnLine(is_online);
 }