| Index: ui/views/controls/throbber.h
|
| diff --git a/ui/views/controls/throbber.h b/ui/views/controls/throbber.h
|
| index aeb1d9b7a96b0062e6ba28478dfa3f034ddd288a..7fa6ea834dc793e88808fbe220acd8418737c704 100644
|
| --- a/ui/views/controls/throbber.h
|
| +++ b/ui/views/controls/throbber.h
|
| @@ -12,7 +12,9 @@
|
| #include "base/timer.h"
|
| #include "ui/views/view.h"
|
|
|
| -class SkBitmap;
|
| +namespace gfx {
|
| +class ImageSkia;
|
| +}
|
|
|
| namespace views {
|
|
|
| @@ -25,7 +27,7 @@ class VIEWS_EXPORT Throbber : public View {
|
| // If |paint_while_stopped| is false, this view will be invisible when not
|
| // running.
|
| Throbber(int frame_time_ms, bool paint_while_stopped);
|
| - Throbber(int frame_time_ms, bool paint_while_stopped, SkBitmap* frames);
|
| + Throbber(int frame_time_ms, bool paint_while_stopped, gfx::ImageSkia* frames);
|
| virtual ~Throbber();
|
|
|
| // Start and stop the throbber animation
|
| @@ -33,7 +35,7 @@ class VIEWS_EXPORT Throbber : public View {
|
| virtual void Stop();
|
|
|
| // Set custom throbber frames. Otherwise IDR_THROBBER is loaded.
|
| - void SetFrames(const SkBitmap* frames);
|
| + void SetFrames(const gfx::ImageSkia* frames);
|
|
|
| // Overridden from View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| @@ -49,7 +51,7 @@ class VIEWS_EXPORT Throbber : public View {
|
| bool paint_while_stopped_;
|
| int frame_count_; // How many frames we have.
|
| base::Time start_time_; // Time when Start was called.
|
| - const SkBitmap* frames_; // Frames bitmaps.
|
| + const gfx::ImageSkia* frames_; // Frames images.
|
| base::TimeDelta frame_time_; // How long one frame is displayed.
|
| base::RepeatingTimer<Throbber> timer_; // Used to schedule Run calls.
|
|
|
| @@ -63,7 +65,7 @@ class VIEWS_EXPORT Throbber : public View {
|
| class VIEWS_EXPORT SmoothedThrobber : public Throbber {
|
| public:
|
| explicit SmoothedThrobber(int frame_delay_ms);
|
| - SmoothedThrobber(int frame_delay_ms, SkBitmap* frames);
|
| + SmoothedThrobber(int frame_delay_ms, gfx::ImageSkia* frames);
|
| virtual ~SmoothedThrobber();
|
|
|
| virtual void Start() OVERRIDE;
|
| @@ -116,7 +118,7 @@ class VIEWS_EXPORT CheckmarkThrobber : public Throbber {
|
| bool checked_;
|
|
|
| // The checkmark image.
|
| - const SkBitmap* checkmark_;
|
| + const gfx::ImageSkia* checkmark_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CheckmarkThrobber);
|
| };
|
|
|