Enable pinch & scrollbars by default for CrOS.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3378 matching lines @@
         command_line.GetSwitchValueASCII(switches::kEnableFixedLayout);
     std::vector<std::string> tokens;
     base::SplitString(str, ',', &tokens);
     if (tokens.size() == 2) {
       int width, height;
       if (base::StringToInt(tokens[0], &width) &&
           base::StringToInt(tokens[1], &height))
         webview()->setFixedLayoutSize(WebSize(width, height));
     }
   }
-
+#if defined(OS_CHROMEOS)
+  if (command_line.HasSwitch(switches::kDisablePinch))

[darin (slow to review), 2013/03/08 22:41:22]

I think you should break this apart so you are not duplicating the
setPageScaleFactorLimits calls.

[wjmaclean, 2013/03/11 13:09:10]

Done.

+    webview()->setPageScaleFactorLimits(1, 1);
+  else
+    webview()->setPageScaleFactorLimits(1, 4);
+#else
   if (command_line.HasSwitch(switches::kEnablePinch))
     webview()->setPageScaleFactorLimits(1, 4);
   else
     webview()->setPageScaleFactorLimits(1, 1);
+#endif
 }
 
 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
   WebDataSource* ds = frame->provisionalDataSource();
 
   // In fast/loader/stop-provisional-loads.html, we abort the load before this
   // callback is invoked.
   if (!ds)
     return;
 
@@ skipping 3278 matching lines @@
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 void RenderViewImpl::DidCommitCompositorFrame() {
   RenderWidget::DidCommitCompositorFrame();
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
 }
 
 }  // namespace content