Enable pinch & scrollbars by default for CrOS.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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/gpu/render_widget_compositor.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 160 matching lines @@
         settings.topControlsHideThreshold = hide_threshold;
   }
 
   settings.partialSwapEnabled = widget->AllowPartialSwap() &&
       cmd->HasSwitch(cc::switches::kEnablePartialSwap);
   settings.backgroundColorInsteadOfCheckerboard =
       cmd->HasSwitch(cc::switches::kBackgroundColorInsteadOfCheckerboard);
   settings.showOverdrawInTracing =
       cmd->HasSwitch(cc::switches::kTraceOverdraw);
 
+#if defined(OS_CHROMEOS)
+  settings.usePinchZoomScrollbars =
+    !cmd->HasSwitch(cc::switches::kDisablePinchZoomScrollbars);
+#elif defined(OS_WIN) || defined(OS_LINUX)
+  settings.usePinchZoomScrollbars =
+    cmd->HasSwitch(cc::switches::kEnablePinchZoomScrollbars);
+#endif
   settings.initialDebugState.showFPSCounter =
       cmd->HasSwitch(switches::kShowFPSCounter);
   settings.initialDebugState.showPaintRects =
       cmd->HasSwitch(switches::kShowPaintRects);
   settings.initialDebugState.showDebugBorders =
       cmd->HasSwitch(switches::kShowCompositedLayerBorders);
   settings.initialDebugState.showPlatformLayerTree =
       cmd->HasSwitch(switches::kShowCompositedLayerTree);
 
   settings.initialDebugState.showPropertyChangedRects =
@@ skipping 312 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content