Restore shelf app indicator color for light mode.

This CL addresses the changes in:

https://chromium-review.googlesource.com/c/chromium/src/+/2392949

Bug: 1134854
Change-Id: Ie8f39aa562595bed9f66006b68e3b20b2e29b538
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460307Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815380}

ash/shelf/shelf_app_button.cc

@@ -13,6 +13,8 @@
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button_delegate.h"
 #include "ash/shelf/shelf_view.h"
+#include "ash/style/default_color_constants.h"
+#include "ash/style/default_colors.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ -245,13 +247,8 @@ class ShelfAppButton::AppStatusIndicatorView
     gfx::PointF center = gfx::RectF(GetLocalBounds()).CenterPoint();
     cc::PaintFlags flags;
     // Active and running indicators look a little different in the new UI.
-    AshColorProvider* ash_color_provider = AshColorProvider::Get();
-    auto content_layer_type =
-        active_ ? AshColorProvider::ContentLayerType::kAppStateIndicatorColor
-                : AshColorProvider::ContentLayerType::
-                      kAppStateIndicatorColorInactive;
-    flags.setColor(
-        ash_color_provider->GetContentLayerColor(content_layer_type));
+    flags.setColor(DeprecatedGetAppStateIndicatorColor(
+        active_, kIndicatorColorActive, kInicatorColorRunning));
     flags.setAntiAlias(true);
     flags.setStrokeCap(cc::PaintFlags::Cap::kRound_Cap);
     flags.setStrokeJoin(cc::PaintFlags::Join::kRound_Join);

ash/style/default_color_constants.h

@@ -24,5 +24,7 @@ constexpr SkColor kLoginBackgroundBaseColor = SK_ColorBLACK;
 constexpr SkColor kDefaultShelfInkDropColor = SK_ColorBLACK;
 constexpr float kDefaultShelfInkDropOpacity = 0.2f;
 constexpr SkColor kShelfButtonColor = SK_ColorWHITE;
+constexpr SkColor kIndicatorColorActive = SK_ColorWHITE;
+constexpr SkColor kInicatorColorRunning = SkColorSetA(SK_ColorWHITE, 0x7F);
 
 #endif  // ASH_STYLE_DEFAULT_COLOR_CONSTANTS_H_

ash/style/default_colors.cc

@@ -61,4 +61,16 @@ float DeprecatedGetShelfInkDropOpacity(float default_opacity) {
   return AshColorProvider::Get()->GetRippleAttributes().inkdrop_opacity;
 }
 
+SkColor DeprecatedGetAppStateIndicatorColor(bool active,
+                                            SkColor active_color,
+                                            SkColor default_color) {
+  if (!features::IsDarkLightModeEnabled())
+    return active ? active_color : default_color;
+
+  return AshColorProvider::Get()->GetContentLayerColor(
+      active ? AshColorProvider::ContentLayerType::kAppStateIndicatorColor
+             : AshColorProvider::ContentLayerType::
+                   kAppStateIndicatorColorInactive);
+}
+
 }  // namespace ash

ash/style/default_colors.h

@@ -27,6 +27,9 @@ SkColor DeprecatedGetContentLayerColor(AshColorProvider::ContentLayerType type,
 SkColor DeprecatedGetLoginBackgroundBaseColor(SkColor default_color);
 SkColor DeprecatedGetShelfInkDropBaseColor(SkColor default_color);
 float DeprecatedGetShelfInkDropOpacity(float default_opacity);
+SkColor DeprecatedGetAppStateIndicatorColor(bool active,
+                                            SkColor active_color,
+                                            SkColor default_color);
 }  // namespace ash
 
 #endif  // ASH_STYLE_DEFAULT_COLORS_H_