Update dialog close buttons to use vector icons and ripples.

ui/views/controls/button/vector_icon_button.h

Index: ui/views/controls/button/vector_icon_button.h
diff --git a/chrome/browser/ui/views/bar_control_button.h b/ui/views/controls/button/vector_icon_button.h
similarity index 53%
rename from chrome/browser/ui/views/bar_control_button.h
rename to ui/views/controls/button/vector_icon_button.h
index 902f328b90dd17867e767c4cdbd4416878264eee..b093abb1089e0222c566b7c4684aa77b118ab129 100644
--- a/chrome/browser/ui/views/bar_control_button.h
+++ b/ui/views/controls/button/vector_icon_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
-#define CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
+#ifndef UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_
+#define UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_
 
 #include <memory>
 
@@ -15,19 +15,23 @@ namespace gfx {
 enum class VectorIconId;
 }
 
-// A class for buttons that control bars (find bar, download shelf, etc.). The
-// button has an image and no text.
-class BarControlButton : public views::ImageButton {
+namespace views {
+
+// A button that has an image and no text, with the image defined by a vector
+// icon identifier.
+class VectorIconButton : public views::ImageButton {
  public:
-  explicit BarControlButton(views::ButtonListener* listener);
-  ~BarControlButton() override;
+  explicit VectorIconButton(views::ButtonListener* listener);
+  ~VectorIconButton() override;
 
   // Sets the icon to display and provides a callback which should return the
-  // text color from which to derive this icon's color.
+  // text color from which to derive this icon's color. If the callback is null,
+  // the color will default to kChromeIconGrey.
   void SetIcon(gfx::VectorIconId id,
                const base::Callback<SkColor(void)>& get_text_color_callback);

[sky, 2016/09/06 21:22:47]

I would prefer not to put this class in views because of the use of the callback
and using a constant called gfx::kChromeIconGrey. We generally don't use
callbacks for this sort of thing in views code, and it results in an awkward
api. I would prefer the subclass approach, or making VectorIconButton takes a
special listener for obtaining the color.

[Evan Stade, 2016/09/06 21:45:55]

I can get rid of the kChromeIconGrey pretty easily. As far as the callback, are
you suggesting an interface with a single GetTextColor interface? Would it be
sufficiently less awkward if this instead took a std::function and callers could
provide a lambda?

 
   // views::ImageButton:
+  void OnEnabledChanged() override;
   void OnThemeChanged() override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
@@ -35,7 +39,9 @@ class BarControlButton : public views::ImageButton {
   gfx::VectorIconId id_;
   base::Callback<SkColor(void)> get_text_color_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(BarControlButton);
+  DISALLOW_COPY_AND_ASSIGN(VectorIconButton);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BAR_CONTROL_BUTTON_H_
+}  // namespace views
+
+#endif  // UI_VIEWS_CONTROLS_BUTTON_VECTOR_ICON_BUTTON_H_