Add VectorIconButton functionality to ImageButton.

ui/views/animation/ink_drop_host_view.cc

 // 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.
 
 #include "ui/views/animation/ink_drop_host_view.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/events/event.h"
 #include "ui/events/scoped_target_handler.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 148 matching lines @@
   return CreateDefaultInkDropRipple(GetLocalBounds().CenterPoint());
 }
 
 std::unique_ptr<InkDropHighlight> InkDropHostView::CreateInkDropHighlight()
     const {
   return CreateDefaultInkDropHighlight(
       gfx::RectF(GetLocalBounds()).CenterPoint());
 }
 
 std::unique_ptr<InkDropRipple> InkDropHostView::CreateDefaultInkDropRipple(
-    const gfx::Point& center_point,
-    const gfx::Size& size) const {
+    const gfx::Point& center_point) const {
+  const gfx::Size& size = GetInkDropSize();
   std::unique_ptr<InkDropRipple> ripple(new SquareInkDropRipple(
       CalculateLargeInkDropSize(size), kInkDropLargeCornerRadius, size,
       kInkDropSmallCornerRadius, center_point, GetInkDropBaseColor(),
       ink_drop_visible_opacity()));
   return ripple;
 }
 
 std::unique_ptr<InkDropHighlight>
-InkDropHostView::CreateDefaultInkDropHighlight(const gfx::PointF& center_point,
-                                               const gfx::Size& size) const {
+InkDropHostView::CreateDefaultInkDropHighlight(
+    const gfx::PointF& center_point) const {
+  const gfx::Size& size = GetInkDropSize();
   std::unique_ptr<InkDropHighlight> highlight(new InkDropHighlight(
       size, kInkDropSmallCornerRadius, center_point, GetInkDropBaseColor()));
   highlight->set_explode_size(CalculateLargeInkDropSize(size));
   return highlight;
 }
 
 void InkDropHostView::SetInkDropMode(InkDropMode ink_drop_mode) {
   ink_drop_mode_ = ink_drop_mode;
   ink_drop_ = nullptr;
 
@@ skipping 98 matching lines @@
 
 std::unique_ptr<InkDropImpl>
 InkDropHostView::CreateDefaultFloodFillInkDropImpl() {
   std::unique_ptr<views::InkDropImpl> ink_drop =
       InkDropHostView::CreateDefaultInkDropImpl();
   ink_drop->SetAutoHighlightMode(
       views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
   return ink_drop;
 }
 
+gfx::Size InkDropHostView::GetInkDropSize() const {
+  return gfx::Size(std::min(size().width(), kDefaultInkDropSize),

[bruthig, 2017/03/09 05:04:42]

|kDefaultInkDropSize| is somewhat of an arbitrary value and I've been wanting to
remove it for a while.  I feel like this change is only making more engrained. 
Can you extend ImageButton with a new FindInPageButton that overrides
CreateInkDropRipple() and CreateInkDropHighlight() to return the right sized
effects and remove the changes to InkDropHostView?

I think that the Button refactor that I have planned will eventually purge this
FindInPageButton.

[Bret, 2017/03/09 22:32:37]

It's not just the find-in-page buttons, I modified those because they had a
layout problem when we changed their size for Harmony. Here I'm trying to make
sure the ink drop sizes are reasonable when the button is smaller than 24dip. I
don't like the default constant either but I don't see how this is making it
more ingrained; all buttons are relying on it either way.

[bruthig, 2017/03/10 14:35:25]

I guess I dislike the conditional 'min()' logic more than the constant itself.
Prior to your change it was possible to statically determine what ink drop size
was being used on a button.  With this conditional change I'm now going to need
to know the run time size of the button.  This is going to make it harder to
perform the button refactor and extract the ink drop as an effect.  I will have
to either reverse engineer the run time sizes or I'm going to have to dig up all
of the designer specs.

As a compromise, I'd be happy with introducing an
InkDropHostView::SetDefaultInkDropSize() that clients can use instead if needed.
 This would at least white-list the buttons that require the behavior.

+                   std::min(size().height(), kDefaultInkDropSize));
+}
+
 }  // namespace views