Index: chrome/browser/infobars/infobar.h |
diff --git a/chrome/browser/infobars/infobar.h b/chrome/browser/infobars/infobar.h |
index 179ee18dc01c03f80267ef4d78e7df37cd4909e9..c0aed632d80cc6dc456cca654c19ff724c195043 100644 |
--- a/chrome/browser/infobars/infobar.h |
+++ b/chrome/browser/infobars/infobar.h |
@@ -12,8 +12,8 @@ |
#include "build/build_config.h" |
#include "chrome/browser/infobars/infobar_delegate.h" |
#include "third_party/skia/include/core/SkColor.h" |
-#include "ui/base/animation/animation_delegate.h" |
-#include "ui/base/animation/slide_animation.h" |
+#include "ui/gfx/animation/animation_delegate.h" |
+#include "ui/gfx/animation/slide_animation.h" |
#include "ui/gfx/size.h" |
// TODO(sail): These functions should be static methods in the InfoBar class |
@@ -29,7 +29,7 @@ typedef std::pair<InfoBarDelegate*, InfoBarDelegate*> InfoBarReplacedDetails; |
class InfoBarContainer; |
class InfoBarService; |
-class InfoBar : public ui::AnimationDelegate { |
+class InfoBar : public gfx::AnimationDelegate { |
public: |
InfoBar(InfoBarService* owner, InfoBarDelegate* delegate); |
virtual ~InfoBar(); |
@@ -67,15 +67,15 @@ class InfoBar : public ui::AnimationDelegate { |
// Changes the target height of the main ("bar") portion of the infobar. |
void SetBarTargetHeight(int height); |
- const ui::SlideAnimation& animation() const { return animation_; } |
+ const gfx::SlideAnimation& animation() const { return animation_; } |
int arrow_height() const { return arrow_height_; } |
int arrow_target_height() const { return arrow_target_height_; } |
int arrow_half_width() const { return arrow_half_width_; } |
int total_height() const { return arrow_height_ + bar_height_; } |
protected: |
- // ui::AnimationDelegate: |
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; |
+ // gfx::AnimationDelegate: |
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; |
// Forwards a close request to our owner. |
// NOTE: Subclasses should not call this if we're already unowned. |
@@ -89,7 +89,7 @@ class InfoBar : public ui::AnimationDelegate { |
InfoBarService* owner() const { return owner_; } |
const InfoBarContainer* container() const { return container_; } |
InfoBarContainer* container() { return container_; } |
- ui::SlideAnimation* animation() { return &animation_; } |
+ gfx::SlideAnimation* animation() { return &animation_; } |
int bar_height() const { return bar_height_; } |
int bar_target_height() const { return bar_target_height_; } |
@@ -101,8 +101,8 @@ class InfoBar : public ui::AnimationDelegate { |
virtual void PlatformSpecificOnHeightsRecalculated() {} |
private: |
- // ui::AnimationDelegate: |
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; |
+ // gfx::AnimationDelegate: |
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; |
// Finds the new desired arrow and bar heights, and if they differ from the |
// current ones, calls PlatformSpecificOnHeightRecalculated(). Informs our |
@@ -118,7 +118,7 @@ class InfoBar : public ui::AnimationDelegate { |
InfoBarService* owner_; |
InfoBarDelegate* delegate_; |
InfoBarContainer* container_; |
- ui::SlideAnimation animation_; |
+ gfx::SlideAnimation animation_; |
// The current and target heights of the arrow and bar portions, and half the |
// current arrow width. (It's easier to work in half-widths as we draw the |