| Index: ui/views/controls/button/md_text_button.cc
|
| diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
|
| index 359d756427e600232c417e50b6923bf84388e5c8..9da1078f7692fe0cc322330f54828c6e15cb0066 100644
|
| --- a/ui/views/controls/button/md_text_button.cc
|
| +++ b/ui/views/controls/button/md_text_button.cc
|
| @@ -12,6 +12,7 @@
|
| #include "ui/native_theme/native_theme.h"
|
| #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
|
| #include "ui/views/animation/ink_drop_highlight.h"
|
| +#include "ui/views/animation/ink_drop_impl.h"
|
| #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/border.h"
|
| @@ -121,6 +122,10 @@ SkColor MdTextButton::GetInkDropBaseColor() const {
|
| return color_utils::DeriveDefaultIconColor(label()->enabled_color());
|
| }
|
|
|
| +std::unique_ptr<InkDrop> MdTextButton::CreateInkDrop() {
|
| + return CreateDefaultFloodFillInkDropImpl();
|
| +}
|
| +
|
| std::unique_ptr<views::InkDropRipple> MdTextButton::CreateInkDropRipple()
|
| const {
|
| return std::unique_ptr<views::InkDropRipple>(
|
| @@ -136,9 +141,6 @@ void MdTextButton::StateChanged() {
|
|
|
| std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
|
| const {
|
| - if (!ShouldShowInkDropHighlight())
|
| - return nullptr;
|
| -
|
| // The prominent button hover effect is a shadow.
|
| const int kYOffset = 1;
|
| const int kSkiaBlurRadius = 2;
|
| @@ -159,11 +161,6 @@ std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
|
| shadows, GetLocalBounds(), fill_color, kInkDropSmallCornerRadius)));
|
| }
|
|
|
| -bool MdTextButton::ShouldShowInkDropForFocus() const {
|
| - // These types of button use FocusRing.
|
| - return false;
|
| -}
|
| -
|
| void MdTextButton::SetEnabledTextColors(SkColor color) {
|
| LabelButton::SetEnabledTextColors(color);
|
| UpdateColors();
|
|
|