Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/payments/payment_request_views_util.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 "chrome/browser/ui/views/payments/payment_request_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 10 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/vector_icons/vector_icons.h"
 #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"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 
 namespace payments {
 
@@ skipping 74 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestRowBorderPainter);
 };
 
 }  // namespace
 
 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);
 
   constexpr int kHeaderTopVerticalInset = 14;
   constexpr int kHeaderBottomVerticalInset = 8;
   constexpr int kHeaderHorizontalInset = 16;
   // Top, left, bottom, right.
   layout->SetInsets(kHeaderTopVerticalInset, kHeaderHorizontalInset,
                     kHeaderBottomVerticalInset, kHeaderHorizontalInset);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // A column for the optional back arrow.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
 
   constexpr int kPaddingBetweenArrowAndTitle = 16;
   if (show_back_arrow)
     columns->AddPaddingColumn(0, kPaddingBetweenArrowAndTitle);
 
   // A column for the title.
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   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>(
         PaymentRequestCommonTags::BACK_BUTTON_TAG));
     layout->AddView(back_arrow);
   }
 
   views::Label* title_label = new views::Label(title);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label->SetFontList(
@@ skipping 124 matching lines @@
   if (shipping_option) {
     container->AddChildView(
         new views::Label(base::ASCIIToUTF16(shipping_option->label)));
     container->AddChildView(new views::Label(formatted_amount));
   }
 
   return container;
 }
 
 }  // namespace payments