Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index e31aff2afc603254eaae7dec5e96bbaf6ec40008..9caee748560ce8e3e8b8c3c380ae73df2adbdba2 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -933,7 +933,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
switches::kEnableGpuClientTracing, |
switches::kEnableGpuBenchmarking, |
switches::kEnableMemoryBenchmarking, |
- switches::kEnableOverlayScrollbars, |
switches::kEnableSkiaBenchmarking, |
switches::kEnableLogging, |
switches::kEnableSpeechSynthesis, |
@@ -986,9 +985,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
switches::kEnableEac3Playback, |
switches::kForceDeviceScaleFactor, |
switches::kFullMemoryCrashReport, |
-#if defined(OS_ANDROID) |
- switches::kHideScrollbars, |
-#endif |
#if !defined (GOOGLE_CHROME_BUILD) |
// These are unsupported and not fully tested modes, so don't enable them |
// for official Google Chrome builds. |
@@ -1044,6 +1040,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
cc::switches::kDisableImplSidePainting, |
cc::switches::kDisableThreadedAnimation, |
cc::switches::kEnableImplSidePainting, |
+ cc::switches::kEnableOverlayScrollbars, |
cc::switches::kEnablePartialSwap, |
cc::switches::kEnablePerTilePainting, |
cc::switches::kEnablePinchVirtualViewport, |
@@ -1062,6 +1059,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
cc::switches::kShowScreenSpaceRects, |
cc::switches::kShowSurfaceDamageRects, |
cc::switches::kSlowDownRasterScaleFactor, |
+ cc::switches::kSolidColorScrollbarColor, |
cc::switches::kStrictLayerPropertyChangeChecking, |
cc::switches::kTopControlsHeight, |
cc::switches::kTopControlsHideThreshold, |