commit 4c307804093f444e186f5cde9e799d5dc741fb65
author Xiaodan Zhu <zxdan@chromium.org> Thu Mar 03 22:29:14 2022
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 03 22:29:14 2022
tree 434507ba7d5b9ba5bfbebc34893e031f156fb925
parent 900eb46723fe38630ee7250801eb474a14b60257

cros: apply new shadow style to search box

This CL applies new system shadow style to expanded search box.

The effect is shown in the bug comment.

Bug: 1296305
Change-Id: Iac9db951e1fb464ab1ebeff757d1cd40794c4243
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3502276
Reviewed-by: Min Chen <minch@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaodan Zhu <zxdan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#977363}

ash/app_list/views/search_result_page_view.cc

diff --git a/ash/app_list/views/search_result_page_view.cc b/ash/app_list/views/search_result_page_view.cc
index 5acd751..7bce22cc 100644
--- a/ash/app_list/views/search_result_page_view.cc
+++ b/ash/app_list/views/search_result_page_view.cc
@@ -27,6 +27,7 @@
 #include "ash/public/cpp/view_shadow.h"
 #include "ash/search_box/search_box_constants.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/style/system_shadow.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -37,7 +38,6 @@
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/compositor_extra/shadow.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/insets.h"
@@ -75,8 +75,9 @@
 // Minimum spacing between shelf and bottom of search box.
 constexpr int kSearchResultPageMinimumBottomMargin = 24;
 
-// The shadow elevation value for the shadow of the expanded search box.
-constexpr int kSearchBoxSearchResultShadowElevation = 12;
+// The shadow type for the shadow of the expanded search box.
+constexpr SystemShadow::Type kSearchBoxSearchResultShadowType =
+    SystemShadow::Type::kElevation12;
 
 // The amount of time by which notifications to accessibility framework about
 // result page changes are delayed.
@@ -192,8 +193,10 @@
   contents_view_->SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical, gfx::Insets(), 0));
 
-  view_shadow_ =
-      std::make_unique<ViewShadow>(this, kSearchBoxSearchResultShadowElevation);
+  view_shadow_ = std::make_unique<ViewShadow>(
+      this,
+      SystemShadow::GetElevationFromType(kSearchBoxSearchResultShadowType));
+  view_shadow_->shadow()->SetShadowStyle(gfx::ShadowStyle::kChromeOSSystemUI);
   view_shadow_->SetRoundedCornerRadius(
       kSearchBoxBorderCornerRadiusSearchResult);
 
@@ -611,8 +614,10 @@
 }
 
 void SearchResultPageView::OnAnimationBetweenBoundsEnded() {
-  view_shadow_ =
-      std::make_unique<ViewShadow>(this, kSearchBoxSearchResultShadowElevation);
+  view_shadow_ = std::make_unique<ViewShadow>(
+      this,
+      SystemShadow::GetElevationFromType(kSearchBoxSearchResultShadowType));
+  view_shadow_->shadow()->SetShadowStyle(gfx::ShadowStyle::kChromeOSSystemUI);
   view_shadow_->SetRoundedCornerRadius(
       GetCornerRadiusForSearchResultsState(current_search_results_state_));