| 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 f2371ea5bc245bdbc9f96eeed07b18f7db030984..08c0a033f4ba872f7ff47cc3ffaffc8f829f1346 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -18,7 +18,7 @@
|
| #include "ui/gfx/font_list.h"
|
| #include "ui/gfx/geometry/vector2d.h"
|
| #include "ui/native_theme/native_theme.h"
|
| -#include "ui/views/animation/flood_fill_ink_drop_animation.h"
|
| +#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
|
| #include "ui/views/animation/ink_drop_hover.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/controls/button/label_button_border.h"
|
| @@ -419,13 +419,11 @@ void LabelButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
|
| ink_drop_container_->SetVisible(false);
|
| }
|
|
|
| -std::unique_ptr<views::InkDropAnimation> LabelButton::CreateInkDropAnimation()
|
| - const {
|
| - return GetText().empty()
|
| - ? CustomButton::CreateInkDropAnimation()
|
| - : base::WrapUnique(new views::FloodFillInkDropAnimation(
|
| - GetLocalBounds(), GetInkDropCenter(),
|
| - GetInkDropBaseColor()));
|
| +std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
|
| + return GetText().empty() ? CustomButton::CreateInkDropRipple()
|
| + : base::WrapUnique(new views::FloodFillInkDropRipple(
|
| + GetLocalBounds(), GetInkDropCenter(),
|
| + GetInkDropBaseColor()));
|
| }
|
|
|
| std::unique_ptr<views::InkDropHover> LabelButton::CreateInkDropHover() const {
|
|
|