Chromium Code Reviews| Index: ash/common/shelf/overflow_button.cc |
| diff --git a/ash/common/shelf/overflow_button.cc b/ash/common/shelf/overflow_button.cc |
| index 5c848320f94dc2e677a00ab4ce02759333f9bf0d..8677dbafc479f4cfe44dec64223bcd4e98f1ab78 100644 |
| --- a/ash/common/shelf/overflow_button.cc |
| +++ b/ash/common/shelf/overflow_button.cc |
| @@ -26,6 +26,7 @@ |
| #include "ui/gfx/transform.h" |
| #include "ui/gfx/vector_icons_public.h" |
| #include "ui/views/animation/flood_fill_ink_drop_ripple.h" |
| +#include "ui/views/animation/ink_drop_impl.h" |
| namespace ash { |
| @@ -82,6 +83,10 @@ void OverflowButton::OnPaint(gfx::Canvas* canvas) { |
| PaintForeground(canvas, bounds); |
| } |
| +std::unique_ptr<views::InkDrop> OverflowButton::CreateInkDrop() { |
| + return CreateDefaultFloodFillInkDropImpl(); |
|
sky
2016/11/02 02:52:11
Is there a way the type of button could be express
bruthig
2016/11/04 18:50:36
I'm currently entertaining a few ideas:
1. Inject
sky
2016/11/04 20:36:12
I was thinking more of an enum. What are the set o
bruthig
2016/11/07 18:38:47
So basically there are 3 parameters (Highlight mod
|
| +} |
| + |
| std::unique_ptr<views::InkDropRipple> OverflowButton::CreateInkDropRipple() |
| const { |
| return base::MakeUnique<views::FloodFillInkDropRipple>( |
| @@ -96,10 +101,6 @@ bool OverflowButton::ShouldEnterPushedState(const ui::Event& event) { |
| return CustomButton::ShouldEnterPushedState(event); |
| } |
| -bool OverflowButton::ShouldShowInkDropHighlight() const { |
| - return false; |
| -} |
| - |
| void OverflowButton::NotifyClick(const ui::Event& event) { |
| CustomButton::NotifyClick(event); |
| shelf_view_->ButtonPressed(this, event, ink_drop()); |