Add VectorIconButton functionality to ImageButton.

ui/views/controls/button/image_button.cc

 // Copyright (c) 2012 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/controls/button/image_button.h"
 
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/scoped_canvas.h"
+#include "ui/views/border.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // Default button size if no image is set. This is ignored if there is an image,
 // and exists for historical reasons (any number of clients could depend on this
 // behaviour).
 static const int kDefaultWidth = 16;
 static const int kDefaultHeight = 14;
@@ skipping 63 matching lines @@
 }
 
 void ImageButton::SetMinimumImageSize(const gfx::Size& size) {
   if (minimum_image_size_ == size)
     return;
 
   minimum_image_size_ = size;
   PreferredSizeChanged();
 }
 
+void ImageButton::SetPadding(const gfx::Insets& padding) {

[Evan Stade, 2017/03/15 15:04:02]

What is the motivation to add this method instead of calling SetBorder directly?

[Bret, 2017/03/15 23:39:19]

I see a lot of places where we're doing SetBorder(CreateEmptyBorder(etc)) but
nowhere where we're setting a different kind of border. So I figured I would
make that pattern explicit here.

+  if (padding.IsEmpty())
+    SetBorder(NullBorder());
+  else
+    SetBorder(CreateEmptyBorder(padding));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, View overrides:
 
 gfx::Size ImageButton::GetPreferredSize() const {
   gfx::Size size(kDefaultWidth, kDefaultHeight);
   if (!images_[STATE_NORMAL].isNull()) {
     size = gfx::Size(images_[STATE_NORMAL].width(),
                      images_[STATE_NORMAL].height());
   }
 
@@ skipping 179 matching lines @@
   // accessible toggle button.
   if ((toggled_ && !images_[ButtonState::STATE_NORMAL].isNull()) ||
       (!toggled_ && !alternate_images_[ButtonState::STATE_NORMAL].isNull())) {
     node_data->role = ui::AX_ROLE_TOGGLE_BUTTON;
     if (toggled_)
       node_data->AddStateFlag(ui::AX_STATE_PRESSED);
   }
 }
 
 }  // namespace views