Introduce some util code for drawing vector assets.

ui/views/controls/image_view.cc

 // Copyright (c) 2012 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 "ui/views/controls/image_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 13 matching lines @@
   return bitmap.getPixels();
 }
 
 }  // namespace
 
 // static
 const char ImageView::kViewClassName[] = "ImageView";
 
 ImageView::ImageView()
     : image_size_set_(false),
+      vector_id_(gfx::VECTOR_ICON_NONE),
       horiz_alignment_(CENTER),
       vert_alignment_(CENTER),
       interactive_(true),
       last_paint_scale_(0.f),
       last_painted_bitmap_pixels_(NULL),
       focus_painter_(Painter::CreateDashedFocusPainter()) {
 }
 
 ImageView::~ImageView() {
 }
@@ skipping 16 matching lines @@
   } else {
     gfx::ImageSkia t;
     SetImage(t);
   }
 }
 
 const gfx::ImageSkia& ImageView::GetImage() {
   return image_;
 }
 
+void ImageView::SetVectorIcon(gfx::VectorIconId id, SkColor color) {
+  vector_id_ = id;
+  vector_color_ = color;
+}
+
 void ImageView::SetImageSize(const gfx::Size& image_size) {
   image_size_set_ = true;
   image_size_ = image_size;
   PreferredSizeChanged();
 }
 
 bool ImageView::GetImageSize(gfx::Size* image_size) const {
   DCHECK(image_size);
   if (image_size_set_)
     *image_size = image_size_;
@@ skipping 74 matching lines @@
 
 void ImageView::OnBlur() {
   View::OnBlur();
   if (focus_painter_.get())
     SchedulePaint();
 }
 
 void ImageView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
   OnPaintImage(canvas);
+  OnPaintVectorIcon(canvas);
   Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 void ImageView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_IMAGE;
   state->name = tooltip_text_;
 }
 
 const char* ImageView::GetClassName() const {
   return kViewClassName;
@@ skipping 59 matching lines @@
     paint.setFilterQuality(kLow_SkFilterQuality);
     canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
         image_bounds.x(), image_bounds.y(), image_bounds.width(),
         image_bounds.height(), true, paint);
   } else {
     canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
   }
   last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
 }
 
+void ImageView::OnPaintVectorIcon(gfx::Canvas* canvas) {
+  if (vector_id_ == gfx::VECTOR_ICON_NONE)
+    return;
+
+  gfx::Vector2d origin = ComputeImageOrigin(image_size_) - gfx::Point();
+  canvas->Translate(origin);
+  gfx::PaintVectorIcon(canvas, vector_id_, image_size_.width(), vector_color_);

[sky, 2015/07/01 16:19:52]

Seems like you should DCHECK on image_size_.

[Evan Stade, 2015/07/01 21:52:59]

Done.

+}
+
 }  // namespace views