Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1948)

Unified Diff: ash/shelf/background_animator.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/shelf/background_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/background_animator.h
diff --git a/ash/shelf/background_animator.h b/ash/shelf/background_animator.h
index dbe495a2bc31ac6332846368098c68e5fd9e591f..7436b30f1f0681eb59ffc7d3059483898230276f 100644
--- a/ash/shelf/background_animator.h
+++ b/ash/shelf/background_animator.h
@@ -7,8 +7,8 @@
#include "ash/ash_export.h"
#include "base/basictypes.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"
namespace ash {
namespace internal {
@@ -23,7 +23,7 @@ class ASH_EXPORT BackgroundAnimatorDelegate {
};
// BackgroundAnimator is used by the shelf to animate the background (alpha).
-class ASH_EXPORT BackgroundAnimator : public ui::AnimationDelegate {
+class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
public:
// How the background can be changed.
enum ChangeType {
@@ -48,8 +48,8 @@ class ASH_EXPORT BackgroundAnimator : public ui::AnimationDelegate {
// Current alpha.
int alpha() const { return alpha_; }
- // ui::AnimationDelegate overrides:
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+ // gfx::AnimationDelegate overrides:
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
private:
BackgroundAnimatorDelegate* delegate_;
@@ -57,7 +57,7 @@ class ASH_EXPORT BackgroundAnimator : public ui::AnimationDelegate {
const int min_alpha_;
const int max_alpha_;
- ui::SlideAnimation animation_;
+ gfx::SlideAnimation animation_;
// Whether the background is painted.
bool paints_background_;
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/shelf/background_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698