Partially restore classic launcher.

This addresses changes in this CL:

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

Other functions in app_list_color_provider_impl will be updated later.

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

ash/app_list/app_list_color_provider_impl.cc

@@ -5,6 +5,7 @@
 #include "ash/app_list/app_list_color_provider_impl.h"
 
 #include "ash/style/ash_color_provider.h"
+#include "ash/style/default_colors.h"
 
 namespace ash {
 
@@ -14,29 +15,30 @@ AppListColorProviderImpl::AppListColorProviderImpl()
 AppListColorProviderImpl::~AppListColorProviderImpl() = default;
 
 SkColor AppListColorProviderImpl::GetExpandArrowInkDropBaseColor() const {
-  return ash_color_provider_
-      ->GetRippleAttributes(GetExpandArrowIconBackgroundColor())
-      .base_color;
+  return DeprecatedGetShelfInkDropBaseColor(
+      SkColorSetARGB(0x14, 0xFF, 0xFF, 0xFF));
 }
 
 SkColor AppListColorProviderImpl::GetExpandArrowIconBaseColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kButtonIconColor);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kButtonIconColor, SK_ColorWHITE);
 }
 
 SkColor AppListColorProviderImpl::GetExpandArrowIconBackgroundColor() const {
-  return ash_color_provider_->GetControlsLayerColor(
-      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
+  return DeprecatedGetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive,
+      SkColorSetARGB(0xF, 0xFF, 0xFF, 0xFF));
 }
 
 SkColor AppListColorProviderImpl::GetAppListBackgroundColor() const {
-  return ash_color_provider_->GetShieldLayerColor(
-      AshColorProvider::ShieldLayerType::kShield80);
+  return DeprecatedGetShieldLayerColor(
+      AshColorProvider::ShieldLayerType::kShield80, gfx::kGoogleGrey900);
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxBackgroundColor() const {
-  return ash_color_provider_->GetControlsLayerColor(
-      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
+  return DeprecatedGetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive,
+      SK_ColorWHITE);
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxCardBackgroundColor() const {
@@ -46,13 +48,15 @@ SkColor AppListColorProviderImpl::GetSearchBoxCardBackgroundColor() const {
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxPlaceholderTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorSecondary);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorSecondary,
+      gfx::kGoogleGrey200);
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary,
+      SkColorSetRGB(0x33, 0x33, 0x33));
 }
 
 SkColor AppListColorProviderImpl::GetSearchBoxSecondaryTextColor() const {
@@ -61,18 +65,20 @@ SkColor AppListColorProviderImpl::GetSearchBoxSecondaryTextColor() const {
 }
 
 SkColor AppListColorProviderImpl::GetSuggestionChipBackgroundColor() const {
-  return ash_color_provider_->GetControlsLayerColor(
-      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
+  return DeprecatedGetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive,
+      SkColorSetA(gfx::kGoogleGrey100, 0x14));
 }
 
 SkColor AppListColorProviderImpl::GetSuggestionChipTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary,
+      gfx::kGoogleGrey100);
 }
 
 SkColor AppListColorProviderImpl::GetAppListItemTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary, SK_ColorBLACK);
 }
 
 SkColor AppListColorProviderImpl::GetPageSwitcherButtonColor() const {

ash/app_list/views/search_box_view.cc

@@ -25,6 +25,7 @@
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/vector_icons/vector_icons.h"
+#include "ash/public/cpp/ash_features.h"
 #include "ash/public/cpp/wallpaper_types.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/search_box/search_box_constants.h"
@@ -391,7 +392,10 @@ void SearchBoxView::OnWallpaperColorsChanged() {
   search_box()->set_placeholder_text_color(
       app_list_color_provider->GetSearchBoxPlaceholderTextColor());
   search_box()->SetTextColor(app_list_color_provider->GetSearchBoxTextColor());
-  UpdateBackgroundColor(app_list_color_provider->GetSearchBoxBackgroundColor());
+  if (features::IsDarkLightModeEnabled()) {
+    UpdateBackgroundColor(
+        app_list_color_provider->GetSearchBoxBackgroundColor());
+  }
   SchedulePaint();
 }