| Index: chrome/browser/extensions/extension_action.h
|
| diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h
|
| index c7f1fac5e67e75b217f187e13019e37750782604..7883f1b49c664527ab8a2909aa92e0fb02694309 100644
|
| --- a/chrome/browser/extensions/extension_action.h
|
| +++ b/chrome/browser/extensions/extension_action.h
|
| @@ -20,7 +20,7 @@
|
| #include "third_party/skia/include/core/SkColor.h"
|
| // TODO(robertphillips): change this to "class SkBaseDevice;"
|
| #include "third_party/skia/include/core/SkDevice.h"
|
| -#include "ui/base/animation/linear_animation.h"
|
| +#include "ui/gfx/animation/linear_animation.h"
|
|
|
| class GURL;
|
| class SkBitmap;
|
| @@ -54,7 +54,7 @@ class ExtensionAction {
|
| };
|
|
|
| // A fade-in animation.
|
| - class IconAnimation : public ui::LinearAnimation {
|
| + class IconAnimation : public gfx::LinearAnimation {
|
| public:
|
| // Observes changes to icon animation state.
|
| class Observer {
|
| @@ -100,7 +100,7 @@ class ExtensionAction {
|
|
|
| base::WeakPtr<IconAnimation> AsWeakPtr();
|
|
|
| - // ui::LinearAnimation implementation.
|
| + // gfx::LinearAnimation implementation.
|
| virtual void AnimateToState(double state) OVERRIDE;
|
|
|
| // Device we use to paint icons to.
|
|
|