Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

ash/common/frame/caption_buttons/frame_caption_button_container_view.h

 // Copyright 2013 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.
 
 #ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 #define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
 #include "ash/common/frame/caption_buttons/frame_size_button_delegate.h"
 #include "base/macros.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class SlideAnimation;
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 
 // Container view for the frame caption buttons. It performs the appropriate
 // action when a caption button is clicked.
@@ skipping 31 matching lines @@
 
    private:
     FrameCaptionButtonContainerView* container_view_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   // 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.
   void SetPaintAsActive(bool paint_as_active);
 
   // Sets whether the buttons should be painted in a lighter color (for use on
   // dark backgrounds).
   void SetUseLightImages(bool light);
 
   // Tell the window controls to reset themselves to the normal state.
@@ skipping 52 matching lines @@
 
   // The widget that the buttons act on.
   views::Widget* frame_;
 
   // The buttons. In the normal button style, at most one of |minimize_button_|
   // and |size_button_| is visible.
   FrameCaptionButton* minimize_button_;
   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_|.
   std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_