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 167 matching lines @@
 std::unique_ptr<InkDropHighlight>
 InkDropHostView::CreateDefaultInkDropHighlight(const gfx::PointF& center_point,
                                                const gfx::Size& size) const {
   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) {
+  if (ink_drop_mode == ink_drop_mode_)

[Evan Stade, 2017/03/17 13:54:44]

this doesn't seem like a bad thing but could it have unintended consequences?

Aside from perhaps tests, it seems like this is only called right after
construction. Can we make that a requirement?

Either way, I don't think it's necessary for this change any more, so maybe it
should be separated.

[Bret, 2017/03/17 23:41:41]

I didn't see any trouble with this when I was testing, but reverted for now
anyway.

+    return;
+
   ink_drop_mode_ = ink_drop_mode;
   ink_drop_ = nullptr;
 
   if (ink_drop_mode_ != InkDropMode::ON)
     gesture_handler_ = nullptr;
   else if (!gesture_handler_)
     gesture_handler_ = base::MakeUnique<InkDropGestureHandler>(this);
 }
 
 gfx::Point InkDropHostView::GetInkDropCenterBasedOnLastEvent() const {
@@ skipping 92 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;
 }
 
 }  // namespace views