Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

ash/common/frame/caption_buttons/frame_caption_button_container_view.h

Index: ash/common/frame/caption_buttons/frame_caption_button_container_view.h
diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view.h b/ash/common/frame/caption_buttons/frame_caption_button_container_view.h
index 55fd39cd8a61edc2da4478bf039988ad45257e9c..014071a702eed280372859c6e91f0ffdb554006c 100644
--- a/ash/common/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view.h
@@ -16,7 +16,7 @@
 
 namespace gfx {
 class SlideAnimation;
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace views {
@@ -68,7 +68,8 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   // Sets the id of the vector image to paint the button for |icon|. The
   // FrameCaptionButtonContainerView will keep track of the image to use for
   // |icon| even if none of the buttons currently use |icon|.
-  void SetButtonImage(CaptionButtonIcon icon, gfx::VectorIconId icon_image_id);
+  void SetButtonImage(CaptionButtonIcon icon,
+                      const gfx::VectorIcon& icon_definition);
 
   // Sets whether the buttons should be painted as active. Does not schedule
   // a repaint.
@@ -141,9 +142,9 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   FrameCaptionButton* size_button_;
   FrameCaptionButton* close_button_;
 
-  // Mapping of the image ID needed to paint a button for each of the values of
+  // Mapping of the image needed to paint a button for each of the values of
   // CaptionButtonIcon.
-  std::map<CaptionButtonIcon, gfx::VectorIconId> button_icon_id_map_;
+  std::map<CaptionButtonIcon, const gfx::VectorIcon*> button_icon_map_;
 
   // Animation that affects the position of |minimize_button_| and the
   // visibility of |size_button_|.