| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 615318fe42c1d7e1a549b7f3fbd8387b5a41eb3f..b93d973624e264be98d805c4d65cc1022caed090 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -27,9 +27,9 @@
|
| #include "ui/native_theme/native_theme.h"
|
| #include "ui/native_theme/native_theme_aura.h"
|
| #include "ui/resources/grit/ui_resources.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_ripple.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/controls/button/custom_button.h"
|
| #include "ui/views/controls/button/label_button.h"
|
| @@ -142,7 +142,7 @@ class TransparentButton : public CustomButton {
|
| return hover_animation().GetCurrentValue();
|
| }
|
|
|
| - // Overridden from InkDropHost:
|
| + // InkDropHost:
|
| std::unique_ptr<InkDrop> CreateInkDrop() override {
|
| std::unique_ptr<views::InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
|
| ink_drop->SetShowHighlightOnHover(false);
|
| @@ -150,12 +150,12 @@ class TransparentButton : public CustomButton {
|
| }
|
|
|
| std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override {
|
| - return std::unique_ptr<views::InkDropRipple>(
|
| - new views::FloodFillInkDropRipple(
|
| - size(), GetInkDropCenterBasedOnLastEvent(),
|
| - GetNativeTheme()->GetSystemColor(
|
| - ui::NativeTheme::kColorId_LabelEnabledColor),
|
| - ink_drop_visible_opacity()));
|
| + return CreateFloodFillInkDropRipple();
|
| + }
|
| +
|
| + SkColor GetInkDropBaseColor() const override {
|
| + return GetNativeTheme()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_LabelEnabledColor);
|
| }
|
|
|
| private:
|
|
|