Set default pinch viewport overlay scrollbar thickness in WebPreferences.

WebSettings defaults this value to 0, so we need to set the default value in
WebPreferences.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/17558002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208076 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/web_contents/web_contents_impl.cc

@@ -549,8 +549,10 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       !command_line.HasSwitch(switches::kDisableThreadedHTMLParser);
   prefs.experimental_websocket_enabled =
       command_line.HasSwitch(switches::kEnableExperimentalWebSocket);
-  prefs.pinch_virtual_viewport_enabled =
-      command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport);
+  if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport)) {
+    prefs.pinch_virtual_viewport_enabled = true;
+    prefs.pinch_overlay_scrollbar_thickness = 10;
+  }
 
 #if defined(OS_ANDROID)
   prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(

webkit/common/webpreferences.cc

@@ -118,6 +118,7 @@ WebPreferences::WebPreferences()
       spatial_navigation_enabled(false),
       experimental_websocket_enabled(false),
       pinch_virtual_viewport_enabled(false),
+      pinch_overlay_scrollbar_thickness(0),
       cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,

webkit/common/webpreferences.h

@@ -153,6 +153,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   bool spatial_navigation_enabled;
   bool experimental_websocket_enabled;
   bool pinch_virtual_viewport_enabled;
+  int pinch_overlay_scrollbar_thickness;
 
   // This flags corresponds to a Page's Settings' setCookieEnabled state. It
   // only controls whether or not the "document.cookie" field is properly

webkit/renderer/webpreferences_renderer.cc

@@ -341,6 +341,9 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
       prefs.experimental_websocket_enabled);
   settings->setPinchVirtualViewportEnabled(
       prefs.pinch_virtual_viewport_enabled);
+
+  settings->setPinchOverlayScrollbarThickness(
+      prefs.pinch_overlay_scrollbar_thickness);
 }