Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

ash/common/frame/caption_buttons/frame_caption_button.h

Index: ash/common/frame/caption_buttons/frame_caption_button.h
diff --git a/ash/common/frame/caption_buttons/frame_caption_button.h b/ash/common/frame/caption_buttons/frame_caption_button.h
index 3f808629632052f1d6bc4dcfa2cd01a6ea0a78dd..8b6df285b534eeb44c82a17b119ee615cb0d75eb 100644
--- a/ash/common/frame/caption_buttons/frame_caption_button.h
+++ b/ash/common/frame/caption_buttons/frame_caption_button.h
@@ -15,7 +15,7 @@
 
 namespace gfx {
 class SlideAnimation;
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace ash {
@@ -32,12 +32,12 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
   ~FrameCaptionButton() override;
 
   // Sets the image to use to paint the button. If |animate| is ANIMATE_YES,
-  // the button crossfades to the new visuals. If the image id matches the one
+  // the button crossfades to the new visuals. If the image matches the one
   // currently used by the button and |animate| is ANIMATE_NO, the crossfade
   // animation is progressed to the end.
   void SetImage(CaptionButtonIcon icon,
                 Animate animate,
-                gfx::VectorIconId icon_image_id);
+                const gfx::VectorIcon& icon_image);
 
   // Returns true if the button is crossfading to new visuals set in
   // SetImage().
@@ -59,8 +59,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
 
   CaptionButtonIcon icon() const { return icon_; }
 
-  gfx::VectorIconId icon_image_id() const { return icon_image_id_; }
-
   void set_size(const gfx::Size& size) { size_ = size; }
 
  protected:
@@ -90,7 +88,7 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
 
   // The image id (kept for the purposes of testing) and image used to paint the
   // button's icon.
-  gfx::VectorIconId icon_image_id_;
+  const gfx::VectorIcon* icon_definition_ = nullptr;
   gfx::ImageSkia icon_image_;
 
   // The icon image to crossfade from.