Chromium Code Reviews| Index: ui/views/animation/square_ink_drop_ripple.h |
| diff --git a/ui/views/animation/square_ink_drop_ripple.h b/ui/views/animation/square_ink_drop_ripple.h |
| index bd13b75a042581cc2c8bedcae67920db7049e1b9..40a4d367b0236d7baf0cc2b3e62c39e59ea6cc4a 100644 |
| --- a/ui/views/animation/square_ink_drop_ripple.h |
| +++ b/ui/views/animation/square_ink_drop_ripple.h |
| @@ -108,17 +108,6 @@ class VIEWS_EXPORT SquareInkDropRipple : public InkDropRipple { |
| void SetStateToHidden() override; |
| void AbortAllAnimations() override; |
| - // Animates the |root_layer_| to the specified |center_point|. The animation |
| - // will be configured with the given |duration|, |tween|, and |
| - // |preemption_strategy| values. The |observer| will be added to all |
| - // LayerAnimationSequences if not null. |
| - void AnimateCenterPoint( |
| - const gfx::Point& center_point, |
| - base::TimeDelta duration, |
| - ui::LayerAnimator::PreemptionStrategy preemption_strategy, |
| - gfx::Tween::Type tween, |
| - ui::LayerAnimationObserver* observer); |
| - |
| // Animates all of the painted shape layers to the specified |transforms|. The |
| // animation will be configured with the given |duration|, |tween|, and |
| // |preemption_strategy| values. The |observer| will be added to all |
| @@ -179,26 +168,26 @@ class VIEWS_EXPORT SquareInkDropRipple : public InkDropRipple { |
| ActivatedShape activated_shape_; |
| // Ink drop opacity when it is visible. |
| - float visible_opacity_; |
| + const float visible_opacity_; |
| // The center point that the ripple will animate to. |
| - gfx::Point target_center_point_; |
| + const gfx::Point target_center_point_; |
|
bruthig
2017/04/11 17:23:43
nit: Remove
Evan Stade
2017/04/11 18:01:27
we'll need to bring it back in the next CL but don
|
| // Maximum size that an ink drop will be drawn to for any InkDropState whose |
| // final frame should be large. |
| - gfx::Size large_size_; |
| + const gfx::Size large_size_; |
| // Corner radius used to draw the rounded rectangles corner for any |
| // InkDropState whose final frame should be large. |
| - int large_corner_radius_; |
| + const int large_corner_radius_; |
| // Maximum size that an ink drop will be drawn to for any InkDropState whose |
| // final frame should be small. |
| - gfx::Size small_size_; |
| + const gfx::Size small_size_; |
| // Corner radius used to draw the rounded rectangles corner for any |
| // InkDropState whose final frame should be small. |
| - int small_corner_radius_; |
| + const int small_corner_radius_; |
| // ui::LayerDelegate to paint circles for all the circle layers. |
| std::unique_ptr<CircleLayerDelegate> circle_layer_delegate_; |