Extracting more than one wallpaper prominent color

ash/shelf/shelf_background_animator.cc

Index: ash/shelf/shelf_background_animator.cc
diff --git a/ash/shelf/shelf_background_animator.cc b/ash/shelf/shelf_background_animator.cc
index b9500b0886d97a39b1daffb9030301db8163be4a..25a537abc0a6d66b3b9fb7794ce37e0432a56798 100644
--- a/ash/shelf/shelf_background_animator.cc
+++ b/ash/shelf/shelf_background_animator.cc
@@ -213,9 +213,11 @@ void ShelfBackgroundAnimator::GetTargetValues(
       break;
   }
 
-  SkColor target_color = wallpaper_controller_
-                             ? wallpaper_controller_->prominent_color()
-                             : kShelfDefaultBaseColor;
+  SkColor target_color =
+      wallpaper_controller_
+          ? wallpaper_controller_->prominent_color(
+                wallpaper_controller_->GetShelfColorProfileIndex())

[Evan Stade, 2017/06/20 17:11:08]

seems like the shelf color profile index should live in this file rather than
WallpaperController

[Qiang(Joe) Xu, 2017/06/20 22:48:55]

Done.

+          : kShelfDefaultBaseColor;
   if (target_color == WallpaperController::kInvalidColor) {
     target_color = kShelfDefaultBaseColor;
   } else {