Revert of Revert vector icon CLs.

ui/views/controls/throbber.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/throbber.h"
 
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_throbber.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/resources/grit/views_resources.h"
 
 namespace views {
 
-Throbber::Throbber() : checked_(false), checkmark_(nullptr) {
+// The default diameter of a Throbber. If you change this, also change
+// kCheckmarkDipSize.
+static const int kDefaultDiameter = 16;
+// The size of the checkmark, in DIP. This magic number matches the default
+// diamater plus padding inherent in the checkmark SVG.
+static const int kCheckmarkDipSize = 18;
+
+Throbber::Throbber() : checked_(false) {
 }
 
 Throbber::~Throbber() {
   Stop();
 }
 
 void Throbber::Start() {
   if (IsRunning())
     return;
 
@@ skipping 14 matching lines @@
 
 void Throbber::SetChecked(bool checked) {
   if (checked == checked_)
     return;
 
   checked_ = checked;
   SchedulePaint();
 }
 
 gfx::Size Throbber::GetPreferredSize() const {
-  const int kDefaultDiameter = 16;
   return gfx::Size(kDefaultDiameter, kDefaultDiameter);
 }
 
 void Throbber::OnPaint(gfx::Canvas* canvas) {
+  SkColor color = GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_ThrobberSpinningColor);
+
   if (!IsRunning()) {
     if (checked_) {
-      if (!checkmark_) {
-        checkmark_ = ui::ResourceBundle::GetSharedInstance()
-                         .GetImageNamed(IDR_CHECKMARK)
-                         .ToImageSkia();
-      }
-
-      int checkmark_x = (width() - checkmark_->width()) / 2;
-      int checkmark_y = (height() - checkmark_->height()) / 2;
-      canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y);
+      canvas->Translate(gfx::Vector2d((width() - kCheckmarkDipSize) / 2,
+                                      (height() - kCheckmarkDipSize) / 2));
+      gfx::PaintVectorIcon(canvas, gfx::VectorIconId::CHECK_CIRCLE,
+                           kCheckmarkDipSize, color);
     }
     return;
   }
 
-  SkColor color = GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_ThrobberSpinningColor);
   base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time_;
   gfx::PaintThrobberSpinning(canvas, GetContentsBounds(), color, elapsed_time);
 }
 
 bool Throbber::IsRunning() const {
   return timer_.IsRunning();
 }
 
 // Smoothed throbber ---------------------------------------------------------
 
@@ skipping 31 matching lines @@
   stop_timer_.Start(FROM_HERE,
                     base::TimeDelta::FromMilliseconds(stop_delay_ms_), this,
                     &SmoothedThrobber::StopDelayOver);
 }
 
 void SmoothedThrobber::StopDelayOver() {
   Throbber::Stop();
 }
 
 }  // namespace views