[ash-md] Wired in the Shelf color to be derived from the Wallpaper.

ash/common/shelf/app_list_button.cc

 // Copyright 2014 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/common/shelf/app_list_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 20 matching lines @@
 #include "ui/views/painter.h"
 
 namespace ash {
 
 AppListButton::AppListButton(InkDropButtonListener* listener,
                              ShelfView* shelf_view,
                              WmShelf* wm_shelf)
     : views::ImageButton(nullptr),
       is_showing_app_list_(false),
       draw_background_as_active_(false),
-      background_alpha_(0),
+      background_color_(kShelfDefaultBaseColor),
       listener_(listener),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf) {
   DCHECK(listener_);
   DCHECK(shelf_view_);
   DCHECK(wm_shelf_);
   if (ash::MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
     set_ink_drop_base_color(kShelfInkDropBaseColor);
     set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
@@ skipping 19 matching lines @@
 
 void AppListButton::OnAppListDismissed() {
   if (ash::MaterialDesignController::IsShelfMaterial())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
   else
     SchedulePaint();
   is_showing_app_list_ = false;
   wm_shelf_->UpdateAutoHideState();
 }
 
-void AppListButton::SetBackgroundAlpha(int alpha) {
-  background_alpha_ = alpha;
+void AppListButton::UpdateShelfItemBackground(SkColor color) {
+  background_color_ = color;
   SchedulePaint();
 }
 
 bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
   ImageButton::OnMousePressed(event);
   shelf_view_->PointerPressedOnButton(this, ShelfView::MOUSE, event);
   return true;
 }
 
 void AppListButton::OnMouseReleased(const ui::MouseEvent& event) {
@@ skipping 65 matching lines @@
   }
 
   views::Painter::PaintFocusPainter(this, canvas, focus_painter());
 }
 
 void AppListButton::PaintMd(gfx::Canvas* canvas) {
   gfx::PointF circle_center(GetCenterPoint());
 
   // Paint the circular background.
   cc::PaintFlags bg_flags;
-  bg_flags.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
+  bg_flags.setColor(background_color_);
   bg_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
   bg_flags.setStyle(cc::PaintFlags::kFill_Style);
   canvas->DrawCircle(circle_center, kAppListButtonRadius, bg_flags);
 
   // Paint a white ring as the foreground. The ceil/dsf math assures that the
   // ring draws sharply and is centered at all scale factors.
   const float kRingOuterRadiusDp = 7.f;
   const float kRingThicknessDp = 1.5f;
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float dsf = canvas->UndoDeviceScaleFactor();
@@ skipping 124 matching lines @@
     return gfx::Point(x_mid, x_mid);
   } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
     return gfx::Point(y_mid, y_mid);
   } else {
     DCHECK_EQ(alignment, SHELF_ALIGNMENT_LEFT);
     return gfx::Point(width() - y_mid, y_mid);
   }
 }
 
 }  // namespace ash