Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: ui/views/controls/button/label_button.cc

Issue 2250783002: Allow InkDropRipple to co-exist with highlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove EmptyInkDropRipple Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/test/test_ink_drop_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index f8147937777dc8b575db1d55fb78e3905bafbb17..c883169c6c1c7e74f8aea4ea66f17171ab032beb 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -448,10 +448,9 @@ std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
return GetText().empty()
? CreateDefaultInkDropRipple(
image()->GetMirroredBounds().CenterPoint())
- : std::unique_ptr<views::InkDropRipple>(
- new views::FloodFillInkDropRipple(
- GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
- GetInkDropBaseColor(), ink_drop_visible_opacity()));
+ : base::MakeUnique<views::FloodFillInkDropRipple>(
+ GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
+ GetInkDropBaseColor(), ink_drop_visible_opacity());
}
std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
« no previous file with comments | « ui/views/animation/test/test_ink_drop_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698