Restore classic search box icon colors.

This addresses changes from:

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

Note that SearchIcon and Assistant buttons are different colors in
classic UI.

Bug: 1134800
Change-Id: I409bc4bde13331766dc8aa8c54dfeda082c653d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462044Reviewed-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@{#815689}

ash/app_list/app_list_color_provider_impl.cc

@@ -100,9 +100,10 @@ SkColor AppListColorProviderImpl::GetPageSwitcherInkDropHighlightColor() const {
                      ripple_attributes.highlight_opacity * 255);
 }
 
-SkColor AppListColorProviderImpl::GetSearchBoxIconColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kButtonIconColor);
+SkColor AppListColorProviderImpl::GetSearchBoxIconColor(
+    SkColor default_color) const {
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kButtonIconColor, default_color);
 }
 
 SkColor AppListColorProviderImpl::GetFolderBackgroundColor(

ash/app_list/app_list_color_provider_impl.h

@@ -30,7 +30,7 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetPageSwitcherButtonColor() const override;
   SkColor GetPageSwitcherInkDropBaseColor() const override;
   SkColor GetPageSwitcherInkDropHighlightColor() const override;
-  SkColor GetSearchBoxIconColor() const override;
+  SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;
   SkColor GetFolderTitleTextColor(SkColor default_color) const override;

ash/app_list/test/test_app_list_color_provider.cc

@@ -73,7 +73,8 @@ SkColor TestAppListColorProvider::GetPageSwitcherInkDropHighlightColor() const {
   return SkColorSetA(SK_ColorBLACK, 0x0F);
 }
 
-SkColor TestAppListColorProvider::GetSearchBoxIconColor() const {
+SkColor TestAppListColorProvider::GetSearchBoxIconColor(
+    SkColor default_color) const {
   return gfx::kGoogleGrey200;
 }
 

ash/app_list/test/test_app_list_color_provider.h

@@ -30,7 +30,7 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetPageSwitcherButtonColor() const override;
   SkColor GetPageSwitcherInkDropBaseColor() const override;
   SkColor GetPageSwitcherInkDropHighlightColor() const override;
-  SkColor GetSearchBoxIconColor() const override;
+  SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;
   SkColor GetFolderTitleTextColor(SkColor default_color) const override;

ash/app_list/views/search_box_view.cc

@@ -197,9 +197,10 @@ void SearchBoxView::UpdateSearchIcon() {
   const gfx::VectorIcon& icon = search_model_->search_engine_is_google()
                                     ? google_icon
                                     : kSearchEngineNotGoogleIcon;
-  SetSearchIconImage(gfx::CreateVectorIcon(
-      icon, kSearchBoxIconSize,
-      AppListColorProvider::Get()->GetSearchBoxIconColor()));
+  SetSearchIconImage(
+      gfx::CreateVectorIcon(icon, kSearchBoxIconSize,
+                            AppListColorProvider::Get()->GetSearchBoxIconColor(
+                                SkColorSetARGB(0xDE, 0x00, 0x00, 0x00))));
 }
 
 void SearchBoxView::UpdateSearchBoxBorder() {
@@ -233,10 +234,11 @@ int SearchBoxView::GetFocusRingSpacing() {
 
 void SearchBoxView::SetupCloseButton() {
   views::ImageButton* close = close_button();
-  close->SetImage(views::ImageButton::STATE_NORMAL,
-                  gfx::CreateVectorIcon(
-                      views::kIcCloseIcon, kSearchBoxIconSize,
-                      AppListColorProvider::Get()->GetSearchBoxIconColor()));
+  close->SetImage(
+      views::ImageButton::STATE_NORMAL,
+      gfx::CreateVectorIcon(views::kIcCloseIcon, kSearchBoxIconSize,
+                            AppListColorProvider::Get()->GetSearchBoxIconColor(
+                                gfx::kGoogleGrey700)));
   close->SetVisible(false);
   base::string16 close_button_label(
       l10n_util::GetStringUTF16(IDS_APP_LIST_CLEAR_SEARCHBOX));
@@ -796,9 +798,9 @@ void SearchBoxView::SetupAssistantButton() {
   views::ImageButton* assistant = assistant_button();
   assistant->SetImage(
       views::ImageButton::STATE_NORMAL,
-      gfx::CreateVectorIcon(
-          chromeos::kAssistantIcon, kSearchBoxIconSize,
-          AppListColorProvider::Get()->GetSearchBoxIconColor()));
+      gfx::CreateVectorIcon(chromeos::kAssistantIcon, kSearchBoxIconSize,
+                            AppListColorProvider::Get()->GetSearchBoxIconColor(
+                                gfx::kGoogleGrey700)));
   base::string16 assistant_button_label(
       l10n_util::GetStringUTF16(IDS_APP_LIST_START_ASSISTANT));
   assistant->SetAccessibleName(assistant_button_label);

ash/public/cpp/app_list/app_list_color_provider.h

@@ -29,7 +29,7 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetPageSwitcherButtonColor() const = 0;
   virtual SkColor GetPageSwitcherInkDropBaseColor() const = 0;
   virtual SkColor GetPageSwitcherInkDropHighlightColor() const = 0;
-  virtual SkColor GetSearchBoxIconColor() const = 0;
+  virtual SkColor GetSearchBoxIconColor(SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxCardBackgroundColor() const = 0;
   virtual SkColor GetFolderBackgroundColor(SkColor default_color) const = 0;
   virtual SkColor GetFolderTitleTextColor(SkColor default_color) const = 0;