Enable pinch & scrollbars by default for CrOS.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8e107b283f09277e92e6b8463081ce51d9dc1ce2..77404f60f0e11fb68d71c6675cd42e0dd5ed4a60 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3346,11 +3346,15 @@ void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
         webview()->setFixedLayoutSize(WebSize(width, height));
     }
   }
-
+  float maxPageScaleFactor = 1;

[jamesr, 2013/03/14 19:55:55]

1.f

+#if defined(OS_CHROMEOS)
+  if (!command_line.HasSwitch(switches::kDisablePinch))
+    maxPageScaleFactor = 4;

[jamesr, 2013/03/14 19:55:55]

4.f

+#else
   if (command_line.HasSwitch(switches::kEnablePinch))
-    webview()->setPageScaleFactorLimits(1, 4);
-  else
-    webview()->setPageScaleFactorLimits(1, 1);
+    maxPageScaleFactor = 4;

[jamesr, 2013/03/14 19:55:55]

4.f

+#endif
+  webview()->setPageScaleFactorLimits(1, maxPageScaleFactor);

[jamesr, 2013/03/14 19:55:55]

1.f

 }
 
 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {