Vectorize CrOS window control icons.

ash/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/frame/caption_buttons/frame_caption_button.h"
 
-#include "ui/base/resource/resource_bundle.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"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 
 namespace ash {
 
 namespace {
 
 // The duration of the crossfade animation when swapping the button's images.
 const int kSwapImagesAnimationDurationMs = 200;
 
 // The duration of the fade out animation of the old icon during a crossfade
 // animation as a ratio of |kSwapImagesAnimationDurationMs|.
@@ skipping 12 matching lines @@
 }  // namespace
 
 // static
 const char FrameCaptionButton::kViewClassName[] = "FrameCaptionButton";
 
 FrameCaptionButton::FrameCaptionButton(views::ButtonListener* listener,
                                        CaptionButtonIcon icon)
     : CustomButton(listener),
       icon_(icon),
       paint_as_active_(false),
+      use_light_images_(false),
       alpha_(255),
-      icon_image_id_(-1),
+      icon_image_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       swap_images_animation_(new gfx::SlideAnimation(this)) {
   swap_images_animation_->Reset(1);
 
   // 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,
-                                  int icon_image_id) {
-  // The early return is dependant on |animate| because callers use SetImage()
+                                  gfx::VectorIconId icon_image_id) {
+  // 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()) &&
       icon_image_id == icon_image_id_) {
     return;
   }
 
   if (animate == ANIMATE_YES)
     crossfade_icon_image_ = icon_image_;
 
   icon_ = icon;
   icon_image_id_ = icon_image_id;
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  icon_image_ = *rb.GetImageSkiaNamed(icon_image_id);
+  icon_image_ = gfx::CreateVectorIcon(
+      icon_image_id, 12,
+      use_light_images_ ? SK_ColorWHITE : gfx::kChromeIconGrey);
 
   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();
   SchedulePaint();
@@ skipping 94 matching lines @@
 
   SkPaint paint;
   paint.setAlpha(alpha);
   canvas->DrawImageInt(to_center,
                        (width() - to_center.width()) / 2,
                        (height() - to_center.height()) / 2,
                        paint);
 }
 
 }  // namespace ash