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

ash/common/wallpaper/wallpaper_controller.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/wallpaper/wallpaper_controller.h"
 
+#include <string>
+#include <utility>
+
+#include "ash/common/ash_switches.h"
 #include "ash/common/wallpaper/wallpaper_controller_observer.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_view.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
+#include "components/wallpaper/wallpaper_color_calculator.h"
 #include "components/wallpaper/wallpaper_resizer.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
+#include "ui/gfx/color_analysis.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
+
 namespace {
 
 // How long to wait reloading the wallpaper after the display size has changed.
 const int kWallpaperReloadDelayMs = 100;
 
 }  // namespace
 
+// static
+bool WallpaperController::GetProminentColorProfile(
+    color_utils::LumaRange* luma,
+    color_utils::SaturationRange* saturation) {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ash::switches::kAshShelfColor)) {

[bshe, 2017/02/24 18:30:36]

nit: ash:: namespace is not necessary for this.

[bruthig, 2017/02/25 17:51:18]

Done.

+    return false;
+  }
+
+  *luma = color_utils::LumaRange::NORMAL;
+  *saturation = color_utils::SaturationRange::VIBRANT;
+
+  const std::string switch_value =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          ash::switches::kAshShelfColor);

[bshe, 2017/02/24 18:30:36]

ditto

[bruthig, 2017/02/25 17:51:18]

Done.

+  if (switch_value.find("light") != std::string::npos)
+    *luma = color_utils::LumaRange::LIGHT;
+  else if (switch_value.find("normal") != std::string::npos)
+    *luma = color_utils::LumaRange::NORMAL;
+  else if (switch_value.find("dark") != std::string::npos)
+    *luma = color_utils::LumaRange::DARK;
+
+  if (switch_value.find("vibrant") != std::string::npos)
+    *saturation = color_utils::SaturationRange::VIBRANT;
+  else if (switch_value.find("muted") != std::string::npos)
+    *saturation = color_utils::SaturationRange::MUTED;
+
+  return true;
+}
+
 WallpaperController::WallpaperController(
     const scoped_refptr<base::TaskRunner>& task_runner)
     : locked_(false),
       wallpaper_mode_(WALLPAPER_NONE),
+      prominent_color_(SK_ColorTRANSPARENT),
       wallpaper_reload_delay_(kWallpaperReloadDelayMs),
       task_runner_(task_runner) {
   WmShell::Get()->AddDisplayObserver(this);
   WmShell::Get()->AddShellObserver(this);
 }
 
 WallpaperController::~WallpaperController() {
+  if (current_wallpaper_)
+    current_wallpaper_->RemoveObserver(this);
+  if (color_calculator_)
+    color_calculator_->RemoveObserver(this);
   WmShell::Get()->RemoveDisplayObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
 }
 
 void WallpaperController::BindRequest(
     mojom::WallpaperControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 gfx::ImageSkia WallpaperController::GetWallpaper() const {
@@ skipping 23 matching lines @@
           << wallpaper::WallpaperResizer::GetImageId(image)
           << " layout=" << layout;
 
   if (WallpaperIsAlreadyLoaded(image, true /* compare_layouts */, layout)) {
     VLOG(1) << "Wallpaper is already loaded";
     return;
   }
 
   current_wallpaper_.reset(new wallpaper::WallpaperResizer(
       image, GetMaxDisplaySizeInNative(), layout, task_runner_));
+  current_wallpaper_->AddObserver(this);
   current_wallpaper_->StartResize();
 
   for (auto& observer : observers_)
     observer.OnWallpaperDataChanged();
   wallpaper_mode_ = WALLPAPER_IMAGE;
   InstallDesktopControllerForAllWindows();
 }
 
 void WallpaperController::CreateEmptyWallpaper() {
+  SetProminentColor(SK_ColorTRANSPARENT);
   current_wallpaper_.reset();
   wallpaper_mode_ = WALLPAPER_IMAGE;
   InstallDesktopControllerForAllWindows();
 }
 
 bool WallpaperController::MoveToLockedContainer() {
   if (locked_)
     return false;
   locked_ = true;
   return ReparentWallpaper(GetWallpaperContainerId(true));
@@ skipping 94 matching lines @@
 }
 
 void WallpaperController::SetWallpaper(const SkBitmap& wallpaper,
                                        wallpaper::WallpaperLayout layout) {
   if (wallpaper.isNull())
     return;
 
   SetWallpaperImage(gfx::ImageSkia::CreateFrom1xBitmap(wallpaper), layout);
 }
 
+void WallpaperController::OnWallpaperResized() {
+  CalculateWallpaperColors();
+}
+
+void WallpaperController::OnColorCalculationComplete() {
+  const SkColor color = color_calculator_->prominent_color();
+  color_calculator_.reset();
+  SetProminentColor(color);
+}
+
 void WallpaperController::InstallDesktopController(WmWindow* root_window) {
   WallpaperWidgetController* component = nullptr;
   int container_id = GetWallpaperContainerId(locked_);
 
   switch (wallpaper_mode_) {
     case WALLPAPER_IMAGE: {
       component = new WallpaperWidgetController(
           CreateWallpaper(root_window, container_id));
       break;
     }
@@ skipping 48 matching lines @@
 int WallpaperController::GetWallpaperContainerId(bool locked) {
   return locked ? kShellWindowId_LockScreenWallpaperContainer
                 : kShellWindowId_WallpaperContainer;
 }
 
 void WallpaperController::UpdateWallpaper(bool clear_cache) {
   current_wallpaper_.reset();
   WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
 }
 
+void WallpaperController::SetProminentColor(SkColor color) {
+  if (prominent_color_ == color)
+    return;
+
+  prominent_color_ = color;
+  for (auto& observer : observers_)
+    observer.OnWallpaperColorsChanged();
+}
+
+void WallpaperController::CalculateWallpaperColors() {
+  color_utils::LumaRange luma;
+  color_utils::SaturationRange saturation;
+  if (!GetProminentColorProfile(&luma, &saturation))
+    return;
+
+  if (color_calculator_)
+    color_calculator_->RemoveObserver(this);
+
+  color_calculator_ = base::MakeUnique<wallpaper::WallpaperColorCalculator>(
+      GetWallpaper(), luma, saturation, task_runner_);
+  color_calculator_->AddObserver(this);
+  if (!color_calculator_->StartCalculation())
+    SetProminentColor(SK_ColorTRANSPARENT);
+}
+
 }  // namespace ash