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

Unified Diff: ui/gfx/animation/slide_animation.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 | « ui/gfx/animation/multi_animation_unittest.cc ('k') | ui/gfx/animation/slide_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/slide_animation.h
diff --git a/ui/base/animation/slide_animation.h b/ui/gfx/animation/slide_animation.h
similarity index 92%
rename from ui/base/animation/slide_animation.h
rename to ui/gfx/animation/slide_animation.h
index 709633b764214881d071b3c859ac27343c757d44..2fc30ae2f49bfbeda49663532cac6177e1390445 100644
--- a/ui/base/animation/slide_animation.h
+++ b/ui/gfx/animation/slide_animation.h
@@ -5,16 +5,16 @@
#ifndef UI_BASE_ANIMATION_SLIDE_ANIMATION_H_
#define UI_BASE_ANIMATION_SLIDE_ANIMATION_H_
-#include "ui/base/animation/linear_animation.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/linear_animation.h"
+#include "ui/gfx/animation/tween.h"
-namespace ui {
+namespace gfx {
// Slide Animation
//
// Used for reversible animations and as a general helper class. Typical usage:
//
-// #include "ui/base/animation/slide_animation.h"
+// #include "ui/gfx/animation/slide_animation.h"
//
// class MyClass : public AnimationDelegate {
// public:
@@ -44,7 +44,7 @@ namespace ui {
// private:
// scoped_ptr<SlideAnimation> animation_;
// }
-class UI_EXPORT SlideAnimation : public LinearAnimation {
+class GFX_EXPORT SlideAnimation : public LinearAnimation {
public:
explicit SlideAnimation(AnimationDelegate* target);
virtual ~SlideAnimation();
@@ -96,6 +96,6 @@ class UI_EXPORT SlideAnimation : public LinearAnimation {
DISALLOW_COPY_AND_ASSIGN(SlideAnimation);
};
-} // namespace ui
+} // namespace gfx
#endif // UI_BASE_ANIMATION_SLIDE_ANIMATION_H_
« no previous file with comments | « ui/gfx/animation/multi_animation_unittest.cc ('k') | ui/gfx/animation/slide_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698