CustomButton cleanup: make protected members private, create accessors

ash/shelf/overflow_button.cc

 // Copyright 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 "ash/shelf/overflow_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "grit/ash_resources.h"
@@ skipping 53 matching lines @@
 
   } else {
     rect.set_origin(gfx::Point(
         bounds.x() + kBackgroundOffset - 1,
         bounds.y() + ((bounds.height() - kButtonHoverSize) / 2) - 1));
   }
 
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
-  paint.setColor(SkColorSetARGB(
-      kButtonHoverAlpha * hover_animation_->GetCurrentValue(),
-      0, 0, 0));
+  paint.setColor(
+      SkColorSetA(SK_ColorBLACK,
+                  hover_animation().CurrentValueBetween(0, kButtonHoverAlpha)));
 
   const SkScalar radius = SkIntToScalar(kButtonCornerRadius);
   SkPath path;
   path.addRoundRect(gfx::RectToSkRect(rect), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
   ShelfLayoutManager* layout_manager =
       ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
@@ skipping 54 matching lines @@
       image = bottom_image_;
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace ash