Restore theming to classic launcher.

This CL temporarily restores themed classic launcher. Themed classic
launcher was incorrectly removed when adding theming for launcher as the
theme-less default value was being used when light/dark mode was
disabled. This CL themes the default color passed on by app_list_view.

Bug: 1163594
Change-Id: I7db2484baf1e73b36602c2cc5e601f50af0b75fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2638409Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846348}

ash/app_list/app_list_color_provider_impl.cc

@@ -40,11 +40,12 @@ SkColor AppListColorProviderImpl::GetExpandArrowIconBackgroundColor() const {
 }
 
 SkColor AppListColorProviderImpl::GetAppListBackgroundColor(
-    bool is_tablet_mode) const {
+    bool is_tablet_mode,
+    SkColor default_color) const {
   return DeprecatedGetShieldLayerColor(
       is_tablet_mode ? AshColorProvider::ShieldLayerType::kShield40
                      : AshColorProvider::ShieldLayerType::kShield80,
-      /*default_color*/ gfx::kGoogleGrey900);
+      default_color);
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxBackgroundColor() const {

ash/app_list/app_list_color_provider_impl.h

@@ -18,7 +18,8 @@ class AppListColorProviderImpl : public AppListColorProvider {
   // AppListColorProvider:
   SkColor GetExpandArrowIconBaseColor() const override;
   SkColor GetExpandArrowIconBackgroundColor() const override;
-  SkColor GetAppListBackgroundColor(bool is_tablet_mode) const override;
+  SkColor GetAppListBackgroundColor(bool is_tablet_mode,
+                                    SkColor default_color) const override;
   SkColor GetSearchBoxBackgroundColor() const override;
   SkColor GetSearchBoxSecondaryTextColor(SkColor default_color) const override;
   SkColor GetSearchBoxTextColor(SkColor default_color) const override;

ash/app_list/app_list_presenter_delegate_unittest.cc

@@ -3768,7 +3768,7 @@ TEST_P(AppListPresenterDelegateHomeLauncherTest, BackgroundOpacity) {
   const U8CPU clamshell_background_opacity = static_cast<U8CPU>(255 * 0.8);
   EXPECT_EQ(SkColorSetA(AppListColorProvider::Get()->GetAppListBackgroundColor(
                             /*is_tablet_mode*/
-                            false),
+                            false, /*default_color*/ gfx::kGoogleGrey900),
                         clamshell_background_opacity),
             GetAppListView()->GetAppListBackgroundShieldColorForTest());
   EXPECT_EQ(1, GetAppListView()
@@ -3782,7 +3782,7 @@ TEST_P(AppListPresenterDelegateHomeLauncherTest, BackgroundOpacity) {
   const U8CPU tablet_background_opacity = static_cast<U8CPU>(0);
   EXPECT_EQ(SkColorSetA(AppListColorProvider::Get()->GetAppListBackgroundColor(
                             /*is_tablet_mode*/
-                            true),
+                            true, /*default_color*/ gfx::kGoogleGrey900),
                         tablet_background_opacity),
             GetAppListView()->GetAppListBackgroundShieldColorForTest());
   EXPECT_EQ(1, GetAppListView()

ash/app_list/views/app_list_view.cc

@@ -70,6 +70,9 @@ namespace ash {
 
 namespace {
 
+// Default color for classic, unthemed app list.
+constexpr SkColor kAppListBackgroundColor = gfx::kGoogleGrey900;
+
 // The height of the half app list from the bottom of the screen.
 constexpr int kHalfAppListHeight = 545;
 
@@ -160,9 +163,26 @@ SkColor GetBackgroundShieldColor(const std::vector<SkColor>& colors,
                                  float color_opacity,
                                  bool is_tablet_mode) {
   const U8CPU sk_opacity_value = static_cast<U8CPU>(255 * color_opacity);
-  return SkColorSetA(
-      AppListColorProvider::Get()->GetAppListBackgroundColor(is_tablet_mode),
-      sk_opacity_value);
+  SkColor default_color =
+      SkColorSetA(kAppListBackgroundColor, sk_opacity_value);
+
+  if (!colors.empty()) {
+    DCHECK_EQ(static_cast<size_t>(ColorProfileType::NUM_OF_COLOR_PROFILES),
+              colors.size());
+    const SkColor dark_muted =
+        colors[static_cast<int>(ColorProfileType::DARK_MUTED)];
+    if (SK_ColorTRANSPARENT != dark_muted) {
+      default_color = SkColorSetA(
+          color_utils::GetResultingPaintColor(
+              SkColorSetA(SK_ColorBLACK, AppListView::kAppListColorDarkenAlpha),
+              dark_muted),
+          sk_opacity_value);
+    }
+  }
+
+  return SkColorSetA(AppListColorProvider::Get()->GetAppListBackgroundColor(
+                         is_tablet_mode, default_color),
+                     sk_opacity_value);
 }
 
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kExcludeWindowFromEventHandling, false)
@@ -480,7 +500,8 @@ class AppListBackgroundShieldView : public views::View {
   explicit AppListBackgroundShieldView(int shelf_background_corner_radius,
                                        bool is_tablet_mode)
       : color_(AppListColorProvider::Get()->GetAppListBackgroundColor(
-            is_tablet_mode)),
+            is_tablet_mode,
+            /*default_color*/ kAppListBackgroundColor)),
         shelf_background_corner_radius_(shelf_background_corner_radius) {
     SetPaintToLayer(ui::LAYER_SOLID_COLOR);
     layer()->SetFillsBoundsOpaquely(false);

ash/public/cpp/app_list/app_list_color_provider.h

@@ -22,9 +22,11 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   // Returns the singleton instance.
   static AppListColorProvider* Get();
 
+  // |default_color| will be used when dark/light mode is disabled.
   virtual SkColor GetExpandArrowIconBaseColor() const = 0;
   virtual SkColor GetExpandArrowIconBackgroundColor() const = 0;
-  virtual SkColor GetAppListBackgroundColor(bool is_tablet_mode) const = 0;
+  virtual SkColor GetAppListBackgroundColor(bool is_tablet_mode,
+                                            SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxBackgroundColor() const = 0;
   virtual SkColor GetSearchBoxTextColor(SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxSecondaryTextColor(

ash/public/cpp/test/test_app_list_color_provider.cc

@@ -17,8 +17,9 @@ SkColor TestAppListColorProvider::GetExpandArrowIconBackgroundColor() const {
 }
 
 SkColor TestAppListColorProvider::GetAppListBackgroundColor(
-    bool is_tablet_mode) const {
-  return SkColorSetA(gfx::kGoogleGrey900,
+    bool is_tablet_mode,
+    SkColor default_color) const {
+  return SkColorSetA(default_color,
                      is_tablet_mode ? 0x66 /*40%*/ : 0xCD /*80%*/);
 }
 

ash/public/cpp/test/test_app_list_color_provider.h

@@ -18,7 +18,8 @@ class TestAppListColorProvider : public AppListColorProvider {
   // AppListColorProvider:
   SkColor GetExpandArrowIconBaseColor() const override;
   SkColor GetExpandArrowIconBackgroundColor() const override;
-  SkColor GetAppListBackgroundColor(bool is_tablet_mode) const override;
+  SkColor GetAppListBackgroundColor(bool is_tablet_mode,
+                                    SkColor default_color) const override;
   SkColor GetSearchBoxBackgroundColor() const override;
   SkColor GetSearchBoxTextColor(SkColor default_color) const override;
   SkColor GetSearchBoxSecondaryTextColor(SkColor default_color) const override;