Revert of Revert vector icon CLs.

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"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/painter.h"
 
 namespace views {
 
 namespace {
 
 // Returns the pixels for the bitmap in |image| at scale |image_scale|.
 void* GetBitmapPixels(const gfx::ImageSkia& img, float image_scale) {
   DCHECK_NE(0.0f, image_scale);
   const SkBitmap& bitmap = img.GetRepresentation(image_scale).sk_bitmap();
   SkAutoLockPixels pixel_lock(bitmap);
   return bitmap.getPixels();
 }
 
 }  // namespace
 
 // static
 const char ImageView::kViewClassName[] = "ImageView";
 
 ImageView::ImageView()
     : image_size_set_(false),
+      vector_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
+      vector_color_(SK_ColorGREEN),
       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,
+                              const gfx::Size& image_size) {
+  SetImageSize(image_size);
+  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_;
-  return image_size_set_;
-}
-
 gfx::Rect ImageView::GetImageBounds() const {
   gfx::Size image_size(image_size_set_ ?
     image_size_ : gfx::Size(image_.width(), image_.height()));
   return gfx::Rect(ComputeImageOrigin(image_size), image_size);
 }
 
 void ImageView::ResetImageSize() {
   image_size_set_ = false;
 }
 
 void ImageView::SetFocusPainter(scoped_ptr<Painter> focus_painter) {
   focus_painter_ = focus_painter.Pass();
 }
 
 gfx::Size ImageView::GetPreferredSize() const {
   gfx::Insets insets = GetInsets();
   if (image_size_set_) {
-    gfx::Size image_size;
-    GetImageSize(&image_size);
+    gfx::Size image_size = image_size_;
     image_size.Enlarge(insets.width(), insets.height());
     return image_size;
   }
   return gfx::Size(image_.width() + insets.width(),
                    image_.height() + insets.height());
 }
 
 bool ImageView::IsImageEqual(const gfx::ImageSkia& img) const {
   // Even though we copy ImageSkia in SetImage() the backing store
   // (ImageSkiaStorage) is not copied and may have changed since the last call
@@ skipping 42 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::VectorIconId::VECTOR_ICON_NONE)
+    return;
+
+  DCHECK(image_size_set_);
+  canvas->Translate(ComputeImageOrigin(image_size_).OffsetFromOrigin());
+  gfx::PaintVectorIcon(canvas, vector_id_, image_size_.width(), vector_color_);
+}
+
 }  // namespace views