Add VectorIconButton functionality to ImageButton.

ui/views/animation/ink_drop_host_view.cc

Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index 85e62b88d93e8c24f9b4d3efb13a25dc2a5336bd..fb286eb97b6bf5436a4cb873f55d657cbf24da2d 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -166,8 +166,8 @@ std::unique_ptr<InkDropHighlight> InkDropHostView::CreateInkDropHighlight()
 }
 
 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(),
@@ -176,8 +176,9 @@ std::unique_ptr<InkDropRipple> InkDropHostView::CreateDefaultInkDropRipple(
 }
 
 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));
@@ -296,4 +297,9 @@ InkDropHostView::CreateDefaultFloodFillInkDropImpl() {
   return ink_drop;
 }
 
+gfx::Size InkDropHostView::GetInkDropSize() const {
+  return gfx::Size(std::min(size().width(), kDefaultInkDropSize),
+                   std::min(size().height(), kDefaultInkDropSize));
+}
+
 }  // namespace views