Chromium Code Reviews| Index: ui/views/animation/ink_drop_host_view.h |
| diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h |
| index eb442da765e5110dbf5b98f16444cb29a20e6714..660baca66d69680aa30b46d009187c3c7dd571c0 100644 |
| --- a/ui/views/animation/ink_drop_host_view.h |
| +++ b/ui/views/animation/ink_drop_host_view.h |
| @@ -54,8 +54,11 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost { |
| void SetInkDropMode(InkDropMode ink_drop_mode); |
| protected: |
| - static const int kInkDropSmallCornerRadius; |
| - static const int kInkDropLargeCornerRadius; |
| + static constexpr int kInkDropSmallCornerRadius = 2; |
| + static constexpr int kInkDropLargeCornerRadius = 4; |
| + |
| + // Size used for the default SquareInkDropRipple. |
| + static constexpr int kInkDropSize = 24; |
|
bruthig
2017/01/31 01:43:19
nit: Can you rename this to |kDefaultInkDropSize|?
Peter Kasting
2017/01/31 02:13:51
Good idea. Done.
|
| // Returns a large ink drop size based on the |small_size| that works well |
| // with the SquareInkDropRipple animation durations. |
| @@ -68,11 +71,13 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost { |
| // Returns the default InkDropRipple centered on |center_point|. |
| std::unique_ptr<InkDropRipple> CreateDefaultInkDropRipple( |
| - const gfx::Point& center_point) const; |
| + const gfx::Point& center_point, |
| + const gfx::Size& size = gfx::Size(kInkDropSize, kInkDropSize)) const; |
| // Returns the default InkDropHighlight centered on |center_point|. |
| std::unique_ptr<InkDropHighlight> CreateDefaultInkDropHighlight( |
| - const gfx::PointF& center_point) const; |
| + const gfx::PointF& center_point, |
| + const gfx::Size& size = gfx::Size(kInkDropSize, kInkDropSize)) const; |
| // Returns the point of the |last_ripple_triggering_event_| if it was a |
| // LocatedEvent, otherwise the center point of the local bounds is returned. |