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

ash/common/shelf/shelf_widget.cc

 // Copyright 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/shelf/shelf_widget.h"
 
 #include "ash/animation/animation_change_type.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_button.h"
@@ skipping 44 matching lines @@
   // views::WidgetDelegateView overrides:
   views::Widget* GetWidget() override { return View::GetWidget(); }
   const views::Widget* GetWidget() const override { return View::GetWidget(); }
 
   bool CanActivate() const override;
   void ReorderChildLayers(ui::Layer* parent_layer) override;
   // This will be called when the parent local bounds change.
   void OnBoundsChanged(const gfx::Rect& old_bounds) override;
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfBackground(int alpha) override;
+  void UpdateShelfBackground(SkColor color) override;
 
  private:
   ShelfWidget* shelf_widget_;
   FocusCycler* focus_cycler_;
   // A black background layer that may be visible depending on a
   // ShelfBackgroundAnimator.
   // TODO(bruthig): Remove opaque_background_ (see https://crbug.com/621551).
   ui::Layer opaque_background_;
   // A black foreground layer which is shown while transitioning between users.
   // Note: Since the back- and foreground layers have different functions they
   // can be used simultaneously - so no repurposing possible.
   ui::Layer opaque_foreground_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegateView);
 };
 
 ShelfWidget::DelegateView::DelegateView(ShelfWidget* shelf_widget)
     : shelf_widget_(shelf_widget),
       focus_cycler_(nullptr),
       opaque_background_(ui::LAYER_SOLID_COLOR),
       opaque_foreground_(ui::LAYER_SOLID_COLOR) {
   DCHECK(shelf_widget_);
   SetLayoutManager(new views::FillLayout());
   set_allow_deactivate_on_esc(true);
   opaque_background_.SetColor(SK_ColorBLACK);
   opaque_background_.SetBounds(GetLocalBounds());
-  opaque_background_.SetOpacity(0.0f);
   opaque_foreground_.SetColor(SK_ColorBLACK);
   opaque_foreground_.SetBounds(GetLocalBounds());
   opaque_foreground_.SetOpacity(0.0f);
 }
 
 ShelfWidget::DelegateView::~DelegateView() {}
 
 void ShelfWidget::DelegateView::SetParentLayer(ui::Layer* layer) {
   layer->Add(&opaque_background_);
   layer->Add(&opaque_foreground_);
@@ skipping 15 matching lines @@
   views::View::ReorderChildLayers(parent_layer);
   parent_layer->StackAtBottom(&opaque_background_);
   parent_layer->StackAtTop(&opaque_foreground_);
 }
 
 void ShelfWidget::DelegateView::OnBoundsChanged(const gfx::Rect& old_bounds) {
   opaque_background_.SetBounds(GetLocalBounds());
   opaque_foreground_.SetBounds(GetLocalBounds());
 }
 
-void ShelfWidget::DelegateView::UpdateShelfBackground(int alpha) {
-  const float kMaxAlpha = 255.0f;
-  opaque_background_.SetOpacity(alpha / kMaxAlpha);
+void ShelfWidget::DelegateView::UpdateShelfBackground(SkColor color) {
+  opaque_background_.SetColor(color);
 }
 
 ShelfWidget::ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf)
     : wm_shelf_(wm_shelf),
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(this)),
       shelf_view_(nullptr),
-      background_animator_(SHELF_BACKGROUND_DEFAULT, wm_shelf_),
+      background_animator_(SHELF_BACKGROUND_DEFAULT,
+                           wm_shelf_,
+                           WmShell::Get()->wallpaper_controller()),
       activating_as_fallback_(false) {
   DCHECK(wm_shelf_);
   background_animator_.AddObserver(this);
   background_animator_.AddObserver(delegate_view_);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "ShelfWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 190 matching lines @@
 
 void ShelfWidget::OnWidgetActivationChanged(views::Widget* widget,
                                             bool active) {
   activating_as_fallback_ = false;
   if (active)
     delegate_view_->SetPaneFocusAndFocusDefault();
   else
     delegate_view_->GetFocusManager()->ClearFocus();
 }
 
-void ShelfWidget::UpdateShelfItemBackground(int alpha) {
+void ShelfWidget::UpdateShelfItemBackground(SkColor color) {
   if (shelf_view_)
-    shelf_view_->UpdateShelfItemBackground(alpha);
+    shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 }  // namespace ash