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

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 126 matching lines @@
  public:
   ThrobberNativeTextButton(views::ButtonListener* listener,
                            const string16& text);
   virtual ~ThrobberNativeTextButton();
 
   // Start or stop the throbber.
   void StartThrobber();
   void StopThrobber();
 
   // Set the throbber bitmap to use. IDR_THROBBER is used by default.
-  void SetFrames(const SkBitmap* frames);
+  void SetFrames(const gfx::ImageSkia* frames);
 
  protected:
-  virtual const SkBitmap& GetImageToPaint() const OVERRIDE;
+  virtual const gfx::ImageSkia& GetImageToPaint() const OVERRIDE;
 
  private:
   // The timer callback to schedule painting this view.
   void Run();
 
-  // Bitmap that contains the throbber frames.
-  const SkBitmap* frames_;
+  // Image that contains the throbber frames.
+  const gfx::ImageSkia* frames_;
 
   // The currently displayed frame, given to GetImageToPaint.
-  mutable SkBitmap this_frame_;
+  mutable gfx::ImageSkia this_frame_;
 
   // How long one frame is displayed.
   base::TimeDelta frame_time_;
 
   // Used to schedule Run calls.
   base::RepeatingTimer<ThrobberNativeTextButton> timer_;
 
   // How many frames we have.
   int frame_count_;
 
   // Time when StartThrobber was called.
   base::TimeTicks start_time_;
 
   // Whether the throbber is shown an animating.
   bool running_;
 
   DISALLOW_COPY_AND_ASSIGN(ThrobberNativeTextButton);
 };
 
 ThrobberNativeTextButton::ThrobberNativeTextButton(
     views::ButtonListener* listener, const string16& text)
     : NativeTextButton(listener, text),
       frame_time_(base::TimeDelta::FromMilliseconds(kThrobberFrameTimeMs)),
       frame_count_(0),
       running_(false) {
   SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_THROBBER).ToSkBitmap());
+      IDR_THROBBER).ToImageSkia());
 }
 
 ThrobberNativeTextButton::~ThrobberNativeTextButton() {
   StopThrobber();
 }
 
 void ThrobberNativeTextButton::StartThrobber() {
   if (running_)
     return;
 
   start_time_ = base::TimeTicks::Now();
   timer_.Start(FROM_HERE, frame_time_, this, &ThrobberNativeTextButton::Run);
   running_ = true;
 
   SchedulePaint();
 }
 
 void ThrobberNativeTextButton::StopThrobber() {
   if (!running_)
     return;
 
   timer_.Stop();
   running_ = false;
 }
 
-void ThrobberNativeTextButton::SetFrames(const SkBitmap* frames) {
+void ThrobberNativeTextButton::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();
 }
 
-const SkBitmap& ThrobberNativeTextButton::GetImageToPaint() const {
+const gfx::ImageSkia& ThrobberNativeTextButton::GetImageToPaint() const {
   if (!running_)
     return NativeTextButton::GetImageToPaint();
 
   const base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time_;
   const int current_frame =
       static_cast<int>(elapsed_time / frame_time_) % frame_count_;
   const int image_size = frames_->height();
   const int image_offset = current_frame * image_size;
 
   SkIRect subset_rect = SkIRect::MakeXYWH(image_offset, 0,
@@ skipping 933 matching lines @@
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
   close_button->SetImage(views::CustomButton::BS_HOT,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
   return close_button;
 }
 #endif