Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

ash/common/frame/caption_buttons/frame_caption_button.cc

 // 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.
 
 #include "ash/common/frame/caption_buttons/frame_caption_button.h"
 
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 38 matching lines @@
 
   // Do not flip the gfx::Canvas passed to the OnPaint() method. The snap left
   // and snap right button icons should not be flipped. The other icons are
   // horizontally symmetrical.
 }
 
 FrameCaptionButton::~FrameCaptionButton() {}
 
 void FrameCaptionButton::SetImage(CaptionButtonIcon icon,
                                   Animate animate,
-                                  gfx::VectorIconId icon_image_id) {
+                                  const gfx::VectorIcon& icon_definition) {
   gfx::ImageSkia new_icon_image = gfx::CreateVectorIcon(
-      icon_image_id, use_light_images_ ? SK_ColorWHITE : gfx::kChromeIconGrey);
+      icon_definition,
+      use_light_images_ ? SK_ColorWHITE : gfx::kChromeIconGrey);
 
   // The early return is dependent on |animate| because callers use SetImage()
   // with ANIMATE_NO to progress the crossfade animation to the end.
   if (icon == icon_ &&
       (animate == ANIMATE_YES || !swap_images_animation_->is_animating()) &&
       new_icon_image.BackedBySameObjectAs(icon_image_)) {
     return;
   }
 
   if (animate == ANIMATE_YES)
     crossfade_icon_image_ = icon_image_;
 
   icon_ = icon;
-  icon_image_id_ = icon_image_id;
+  icon_definition_ = &icon_definition;
   icon_image_ = new_icon_image;
 
   if (animate == ANIMATE_YES) {
     swap_images_animation_->Reset(0);
     swap_images_animation_->SetSlideDuration(kSwapImagesAnimationDurationMs);
     swap_images_animation_->Show();
   } else {
     swap_images_animation_->Reset(1);
   }
   PreferredSizeChanged();
@@ skipping 95 matching lines @@
     alpha *= inactive_alpha;
   }
 
   SkPaint paint;
   paint.setAlpha(alpha);
   canvas->DrawImageInt(to_center, (width() - to_center.width()) / 2,
                        (height() - to_center.height()) / 2, paint);
 }
 
 }  // namespace ash