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

ui/views/controls/throbber.cc

Index: ui/views/controls/throbber.cc
diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc
index 8fe55ffccb77bd48c4f46c74619475424b5dd62b..d9feb144e9c936fb00191e8160209841d288452b 100644
--- a/ui/views/controls/throbber.cc
+++ b/ui/views/controls/throbber.cc
@@ -6,7 +6,7 @@
 
 #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"
@@ -23,7 +23,7 @@ Throbber::Throbber(int frame_time_ms,
       frames_(NULL),
       frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) {
   SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_THROBBER).ToSkBitmap());
+      IDR_THROBBER).ToImageSkia());
 }
 
 Throbber::~Throbber() {
@@ -54,7 +54,7 @@ void Throbber::Stop() {
   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);
@@ -140,7 +140,7 @@ CheckmarkThrobber::CheckmarkThrobber()
     : Throbber(kFrameTimeMs, false),
       checked_(false),
       checkmark_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_CHECKMARK).ToSkBitmap()) {
+          IDR_CHECKMARK).ToImageSkia()) {
 }
 
 void CheckmarkThrobber::SetChecked(bool checked) {