Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

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 "base/time.h"
 #include "grit/ui_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"

[msw, 2012/05/29 07:50:51]

nit: alphabetize

 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace views {
 
 Throbber::Throbber(int frame_time_ms,
                    bool paint_while_stopped)
     : running_(false),
       paint_while_stopped_(paint_while_stopped),
       frames_(NULL),
       frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) {
   SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_THROBBER).ToSkBitmap());
+      IDR_THROBBER).ToImageSkia());
 }
 
 Throbber::~Throbber() {
   Stop();
 }
 
 void Throbber::Start() {
   if (running_)
     return;
 
@@ skipping 10 matching lines @@
 void Throbber::Stop() {
   if (!running_)
     return;
 
   timer_.Stop();
 
   running_ = false;
   SchedulePaint();  // Important if we're not painting while stopped
 }
 
-void Throbber::SetFrames(const SkBitmap* frames) {
+void Throbber::SetFrames(const gfx::ImageSkia* frames) {
   frames_ = frames;
   DCHECK(frames_->width() > 0 && frames_->height() > 0);
   DCHECK(frames_->width() % frames_->height() == 0);
   frame_count_ = frames_->width() / frames_->height();
   PreferredSizeChanged();
 }
 
 void Throbber::Run() {
   DCHECK(running_);
 
@@ skipping 65 matching lines @@
 void SmoothedThrobber::StopDelayOver() {
   Throbber::Stop();
 }
 
 // Checkmark throbber ---------------------------------------------------------
 
 CheckmarkThrobber::CheckmarkThrobber()
     : Throbber(kFrameTimeMs, false),
       checked_(false),
       checkmark_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_CHECKMARK).ToSkBitmap()) {
+          IDR_CHECKMARK).ToImageSkia()) {
 }
 
 void CheckmarkThrobber::SetChecked(bool checked) {
   bool changed = checked != checked_;
   if (changed) {
     checked_ = checked;
     SchedulePaint();
   }
 }
 
 void CheckmarkThrobber::OnPaint(gfx::Canvas* canvas) {
   if (running_) {
     // Let the throbber throb...
     Throbber::OnPaint(canvas);
     return;
   }
   // Otherwise we paint our tick mark or nothing depending on our state.
   if (checked_) {
     int checkmark_x = (width() - checkmark_->width()) / 2;
     int checkmark_y = (height() - checkmark_->height()) / 2;
     canvas->DrawBitmapInt(*checkmark_, checkmark_x, checkmark_y);
   }
 }
 
 }  // namespace views