| Index: chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
|
| diff --git a/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm b/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
|
| index 6afad1088b3b4dc94e2f35c7bb8f5d1bea9f8660..8821a95d2ce69f0c60e4ba77cf33d0dab78c25b8 100644
|
| --- a/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
|
| +++ b/chrome/browser/ui/cocoa/tabs/throbbing_image_view.mm
|
| @@ -4,12 +4,12 @@
|
|
|
| #import "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h"
|
|
|
| -#include "ui/base/animation/animation_delegate.h"
|
| +#include "ui/gfx/animation/animation_delegate.h"
|
|
|
| -class ThrobbingImageViewAnimationDelegate : public ui::AnimationDelegate {
|
| +class ThrobbingImageViewAnimationDelegate : public gfx::AnimationDelegate {
|
| public:
|
| ThrobbingImageViewAnimationDelegate(NSView* view) : view_(view) {}
|
| - virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
|
| + virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
|
| [view_ setNeedsDisplay:YES];
|
| }
|
| private:
|
| @@ -23,13 +23,13 @@ class ThrobbingImageViewAnimationDelegate : public ui::AnimationDelegate {
|
| throbImage:(NSImage*)throbImage
|
| durationMS:(int)durationMS
|
| throbPosition:(ThrobPosition)throbPosition
|
| - animationContainer:(ui::AnimationContainer*)animationContainer {
|
| + animationContainer:(gfx::AnimationContainer*)animationContainer {
|
| if ((self = [super initWithFrame:rect])) {
|
| backgroundImage_.reset([backgroundImage retain]);
|
| throbImage_.reset([throbImage retain]);
|
|
|
| delegate_.reset(new ThrobbingImageViewAnimationDelegate(self));
|
| - throbAnimation_.reset(new ui::ThrobAnimation(delegate_.get()));
|
| + throbAnimation_.reset(new gfx::ThrobAnimation(delegate_.get()));
|
| throbAnimation_->SetContainer(animationContainer);
|
| throbAnimation_->SetThrobDuration(durationMS);
|
| throbAnimation_->StartThrobbing(-1);
|
|
|