Refactor cc scrollbar layers to separate solid-color vs desktop.

android_webview/lib/main/aw_main_delegate.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 "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
@@ skipping 38 matching lines @@
   gpu::GLInProcessContext::SetGpuMemoryBufferFactory(
       gpu_memory_buffer_factory_.get());
   gpu::InProcessCommandBuffer::EnableVirtualizedContext();
 
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
   if (!cl->HasSwitch("disable-map-image"))
     cl->AppendSwitch(cc::switches::kUseMapImage);
 
   // WebView uses the Android system's scrollbars and overscroll glow.
-  cl->AppendSwitch(switches::kHideScrollbars);
+  string hide_scrollbar_switch(cc::switches::kSolidColorScrollbarColor);
+  hide_scrollbar_switch.append("=0x00000000");
+  cl->AppendSwitch(hide_scrollbar_switch.c_str());

[joth, 2013/08/15 21:40:07]

nit: c_str() not needed

[wjmaclean, 2013/08/16 13:34:16]

Did not know that, thanks!

Done.

   cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
 
   // Not yet secure in single-process mode.
   cl->AppendSwitch(switches::kDisableExperimentalWebGL);
 
   return false;
 }
 
 void AwMainDelegate::PreSandboxStartup() {
   // TODO(torne): When we have a separate renderer process, we need to handle
@@ skipping 53 matching lines @@
         AwBrowserContext* browser_context) {
   return AwGeolocationPermissionContext::Create(browser_context);
 }
 
 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
     content::WebContents* web_contents) {
   return AwWebContentsViewDelegate::Create(web_contents);
 }
 
 }  // namespace android_webview