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

ash/common/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/common/shelf/overflow_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 17 matching lines @@
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 
 namespace ash {
 
 OverflowButton::OverflowButton(ShelfView* shelf_view, WmShelf* wm_shelf)
     : CustomButton(nullptr),
       bottom_image_(nullptr),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf),
-      background_alpha_(0) {
+      background_color_(kShelfDefaultBaseColor) {
   DCHECK(shelf_view_);
   if (MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON);
     set_ink_drop_base_color(kShelfInkDropBaseColor);
     set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
     set_hide_ink_drop_when_showing_context_menu(false);
     bottom_image_md_ = CreateVectorIcon(kShelfOverflowIcon, kShelfIconColor);
     bottom_image_ = &bottom_image_md_;
   } else {
     bottom_image_ = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
@@ skipping 15 matching lines @@
   if (!ash::MaterialDesignController::IsShelfMaterial())
     SchedulePaint();
 }
 
 void OverflowButton::OnOverflowBubbleHidden() {
   AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
   if (!ash::MaterialDesignController::IsShelfMaterial())
     SchedulePaint();
 }
 
-void OverflowButton::SetBackgroundAlpha(int alpha) {
-  background_alpha_ = alpha;
+void OverflowButton::UpdateShelfItemBackground(SkColor color) {
+  background_color_ = color;
   SchedulePaint();
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = CalculateButtonBounds();
   PaintBackground(canvas, bounds);
   PaintForeground(canvas, bounds);
 }
 
 std::unique_ptr<views::InkDrop> OverflowButton::CreateInkDrop() {
@@ skipping 28 matching lines @@
   gfx::Insets insets = GetLocalBounds().InsetsFrom(CalculateButtonBounds());
   return base::MakeUnique<views::RoundRectInkDropMask>(
       size(), insets, kOverflowButtonCornerRadius);
 }
 
 void OverflowButton::PaintBackground(gfx::Canvas* canvas,
                                      const gfx::Rect& bounds) {
   if (MaterialDesignController::IsShelfMaterial()) {
     cc::PaintFlags flags;
     flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    flags.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
+    flags.setColor(background_color_);
     canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius, flags);
   } else {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::ImageSkia* background =
         rb.GetImageNamed(NonMaterialBackgroundImageId()).ToImageSkia();
     canvas->DrawImageInt(*background, bounds.x(), bounds.y());
   }
 }
 
 void OverflowButton::PaintForeground(gfx::Canvas* canvas,
@@ skipping 61 matching lines @@
       bounds =
           gfx::Rect(bounds.x() + (bounds.width() - background->width()) / 2,
                     bounds.y() + kShelfItemInset, background->width(),
                     background->height());
     }
   }
   return bounds;
 }
 
 }  // namespace ash