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

ash/common/system/tray/tray_background_view.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 "ash/common/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 99 matching lines @@
   TrayBackgroundView* host_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayWidgetObserver);
 };
 
 class TrayBackground : public views::Background {
  public:
   TrayBackground(TrayBackgroundView* tray_background_view, bool draws_active)
       : tray_background_view_(tray_background_view),
         draws_active_(draws_active),
-        alpha_(0) {}
+        color_(SK_ColorTRANSPARENT) {}
 
   ~TrayBackground() override {}
 
-  void set_alpha(int alpha) { alpha_ = alpha; }
+  void set_color(SkColor color) { color_ = color; }
 
  private:
   WmShelf* GetShelf() const { return tray_background_view_->shelf(); }
 
   void PaintMaterial(gfx::Canvas* canvas, views::View* view) const {
     cc::PaintFlags background_flags;
     background_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    background_flags.setColor(SkColorSetA(kShelfBaseColor, alpha_));
+    background_flags.setColor(color_);
     gfx::Insets insets =
         GetMirroredBackgroundInsets(GetShelf()->GetAlignment());
     gfx::Rect bounds = view->GetLocalBounds();
     bounds.Inset(insets);
     canvas->DrawRoundRect(bounds, kTrayRoundedBorderRadius, background_flags);
 
     if (draws_active_ && tray_background_view_->is_active()) {
       cc::PaintFlags highlight_flags;
       highlight_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
       highlight_flags.setColor(kShelfButtonActivatedHighlightColor);
@@ skipping 55 matching lines @@
   // Reference to the TrayBackgroundView for which this is a background.
   TrayBackgroundView* tray_background_view_;
 
   // Determines whether we should draw an active background for the view when it
   // is active. This is used in non-MD mode. In material design mode, an active
   // ink drop ripple would indicate if the view is active or not.
   // TODO(mohsen): This is used only in non-MD version. Remove when non-MD code
   // is removed (see https://crbug.com/614453).
   bool draws_active_;
 
-  int alpha_;
+  SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackground);
 };
 
 TrayBackgroundView::TrayContainer::TrayContainer(ShelfAlignment alignment)
     : alignment_(alignment) {
   UpdateLayout();
 }
 
 void TrayBackgroundView::TrayContainer::SetAlignment(ShelfAlignment alignment) {
@@ skipping 288 matching lines @@
   // TODO(mohsen): This is needed for non-MD version. Remove when non-MD code is
   // removed (see https://crbug.com/614453).
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
-void TrayBackgroundView::UpdateShelfItemBackground(int alpha) {
+void TrayBackgroundView::UpdateShelfItemBackground(SkColor color) {
   if (background_) {
-    background_->set_alpha(alpha);
+    background_->set_color(color);
     SchedulePaint();
   }
 }
 
 views::View* TrayBackgroundView::GetBubbleAnchor() const {
   return tray_container_;
 }
 
 gfx::Insets TrayBackgroundView::GetBubbleAnchorInsets() const {
   gfx::Insets anchor_insets = GetBubbleAnchor()->GetInsets();
@@ skipping 103 matching lines @@
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash