Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/payments/payment_request_views_util.cc

Index: chrome/browser/ui/views/payments/payment_request_views_util.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc
index 4e3a9b4472eac73039ff9a20c896fbeeb414ea34..3c2be379dfaccb76a10639ce9eee4cc18080161a 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.cc
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc
@@ -28,7 +28,8 @@
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/vector_icon_button.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/image_button_util.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
@@ -123,7 +124,7 @@ class PaymentRequestRowBorderPainter : public views::Painter {
 std::unique_ptr<views::View> CreateSheetHeaderView(
     bool show_back_arrow,
     const base::string16& title,
-    views::VectorIconButtonDelegate* delegate) {
+    views::ButtonListener* listener) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
@@ -152,8 +153,10 @@ std::unique_ptr<views::View> CreateSheetHeaderView(
   if (!show_back_arrow) {
     layout->SkipColumns(1);
   } else {
-    views::VectorIconButton* back_arrow = new views::VectorIconButton(delegate);
-    back_arrow->SetIcon(ui::kBackArrowIcon);
+    views::ImageButton* back_arrow =
+        views::CreateImageButtonWithVectorIconStyling(listener);
+    views::SetImageFromVectorIcon(back_arrow, ui::kBackArrowIcon,
+                                  SK_ColorBLACK);

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

nit: black is technically wrong here although in practice it may not matter. It
should match nearby text, which is going to be the color of title_label. See
comment about defaults in image_button_util.h

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

It was using black before, by way of VectorIconButtonDelegate's default, and no
one was complaining. This is used by multiple views so anything more complicated
would require additional plumbing.

     constexpr int kBackArrowSize = 16;
     back_arrow->SetSize(gfx::Size(kBackArrowSize, kBackArrowSize));
     back_arrow->set_tag(static_cast<int>(