Allow ripple hover/press effects to be more easily sized by subclasses.

ui/views/animation/ink_drop_host_view.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
 
 #include <memory>
 
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 36 matching lines @@
 
   // Toggle to enable/disable an InkDrop on this View.  Descendants can override
   // CreateInkDropHighlight() and CreateInkDropRipple() to change the look/feel
   // of the InkDrop.
   //
   // TODO(bruthig): Add an easier mechanism than overriding functions to allow
   // subclasses/clients to specify the flavor of ink drop.
   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.
   static gfx::Size CalculateLargeInkDropSize(const gfx::Size& small_size);
 
   void set_ink_drop_visible_opacity(float visible_opacity) {
     ink_drop_visible_opacity_ = visible_opacity;
   }
   float ink_drop_visible_opacity() const { return ink_drop_visible_opacity_; }
 
   // 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.
   gfx::Point GetInkDropCenterBasedOnLastEvent() const;
 
   // Animates |ink_drop_| to the desired |ink_drop_state|. Caches |event| as the
   // last_ripple_triggering_event().
   //
   // *** NOTE ***: |event| has been plumbed through on a best effort basis for
   // the purposes of centering ink drop ripples on located Events.  Thus nullptr
@@ skipping 57 matching lines @@
 
   bool destroying_;
 
   std::unique_ptr<views::InkDropMask> ink_drop_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropHostView);
 };
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_