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

cc/trees/layer_tree_impl.cc

Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index be25e6543063f5cba9201e8d242a6e7fec4e55fc..015de38cdbeb4c47385371226cec3b5bf5f02418 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -10,7 +10,7 @@
 #include "cc/debug/traced_value.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/render_surface_impl.h"
-#include "cc/layers/scrollbar_layer_impl.h"
+#include "cc/layers/scrollbar_layer_impl_base.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
@@ -244,6 +244,9 @@ void LayerTreeImpl::ApplySentScrollAndScaleDeltas() {
       root_layer(), base::Bind(&ApplySentScrollDeltasOn));
 }
 
+// TODO(wjmaclean) This needs to go away, and be replaced with a single core
+// of login that works for both scrollbar layer types. This is already planned
+// as part of the larger pinch-zoom re-factoring viewport.
 void LayerTreeImpl::UpdateSolidColorScrollbars() {
   DCHECK(settings().solid_color_scrollbars);
 
@@ -258,12 +261,14 @@ void LayerTreeImpl::UpdateSolidColorScrollbars() {
   if (RootContainerLayer())
     vertical_adjust = layer_tree_host_impl_->VisibleViewportSize().height() -
                       RootContainerLayer()->bounds().height();
-  if (ScrollbarLayerImpl* horiz = root_scroll->horizontal_scrollbar_layer()) {
+  if (ScrollbarLayerImplBase* horiz =
+          root_scroll->horizontal_scrollbar_layer()) {
     horiz->set_vertical_adjust(vertical_adjust);
     horiz->set_visible_to_total_length_ratio(
         scrollable_viewport.width() / ScrollableSize().width());
   }
-  if (ScrollbarLayerImpl* vertical = root_scroll->vertical_scrollbar_layer()) {
+  if (ScrollbarLayerImplBase* vertical =
+          root_scroll->vertical_scrollbar_layer()) {
     vertical->set_vertical_adjust(vertical_adjust);
     vertical->set_visible_to_total_length_ratio(
         scrollable_viewport.height() / ScrollableSize().height());