| commit | 4586729d9d2d655854ca4e8b7d16c1cb80b7a728 | [log] [tgz] |
|---|---|---|
| author | Yulun Wu <[email protected]> | Mon Oct 12 23:27:19 2020 |
| committer | Commit Bot <[email protected]> | Mon Oct 12 23:27:19 2020 |
| tree | abb8065970d947e8055259a7575717abb7cdb52c | |
| parent | 9a3f61fc82fc79e65e8296306fdef02ef2be93cf [diff] |
Restore classic login shelf ink drop. This addresses changes in: https://chromium-review.googlesource.com/c/chromium/src/+/2406934 not addressed in: https://chromium-review.googlesource.com/c/chromium/src/+/2459206 (cherry picked from commit f0dc8e2240ef43aec3b6fc3d189d3a3b54327600) Bug: 1134854 Change-Id: I44dc9cf7782f7dbe692d95659e84dd00062df19a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460248 Reviewed-by: Xiyuan Xia <[email protected]> Reviewed-by: Yulun Wu <[email protected]> Commit-Queue: Yulun Wu <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#815360} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466209 Cr-Commit-Position: refs/branch-heads/4280@{#289} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/ash/shelf/login_shelf_view.cc b/ash/shelf/login_shelf_view.cc index 02633bb0..3322f69 100644 --- a/ash/shelf/login_shelf_view.cc +++ b/ash/shelf/login_shelf_view.cc
@@ -188,10 +188,10 @@ SetFocusPainter(nullptr); SetInkDropMode(InkDropMode::ON); SetHasInkDropActionOnClick(true); - AshColorProvider::RippleAttributes ripple_attributes = - AshColorProvider::Get()->GetRippleAttributes(); - SetInkDropBaseColor(ripple_attributes.base_color); - SetInkDropVisibleOpacity(ripple_attributes.inkdrop_opacity); + SetInkDropBaseColor( + DeprecatedGetShelfInkDropBaseColor(kDefaultShelfInkDropColor)); + SetInkDropVisibleOpacity( + DeprecatedGetShelfInkDropOpacity(kDefaultShelfInkDropOpacity)); // Layer rendering is required when the shelf background is visible, which // happens when the wallpaper is not blurred.