| 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 1d9e7b82cd5dae6fd8f9da9691c13c2ab54e5fc7..2c49f26d87ff1443c964f58135f28a8e51b4d6bb 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -18,11 +18,10 @@
|
| #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_ripple.h"
|
| #include "ui/views/animation/ink_drop.h"
|
| #include "ui/views/animation/ink_drop_highlight.h"
|
| #include "ui/views/animation/ink_drop_impl.h"
|
| -#include "ui/views/animation/square_ink_drop_ripple.h"
|
| +#include "ui/views/animation/ink_drop_ripple.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/controls/button/label_button_border.h"
|
| #include "ui/views/controls/button/label_button_label.h"
|
| @@ -379,19 +378,16 @@ std::unique_ptr<InkDrop> LabelButton::CreateInkDrop() {
|
| : CustomButton::CreateInkDrop();
|
| }
|
|
|
| -std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
|
| +std::unique_ptr<InkDropRipple> LabelButton::CreateInkDropRipple() const {
|
| return ShouldUseFloodFillInkDrop()
|
| - ? base::MakeUnique<views::FloodFillInkDropRipple>(
|
| - size(), GetInkDropCenterBasedOnLastEvent(),
|
| - GetInkDropBaseColor(), ink_drop_visible_opacity())
|
| + ? CreateFloodFillInkDropRipple()
|
| : CreateDefaultInkDropRipple(
|
| image()->GetMirroredBounds().CenterPoint());
|
| }
|
|
|
| -std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
|
| - const {
|
| +std::unique_ptr<InkDropHighlight> LabelButton::CreateInkDropHighlight() const {
|
| return ShouldUseFloodFillInkDrop()
|
| - ? base::MakeUnique<views::InkDropHighlight>(
|
| + ? base::MakeUnique<InkDropHighlight>(
|
| size(), kInkDropSmallCornerRadius,
|
| gfx::RectF(GetLocalBounds()).CenterPoint(),
|
| GetInkDropBaseColor())
|
|
|