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

Unified Diff: ui/gfx/animation/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/compositor/transform_animation_curve_adapter_unittest.cc ('k') | ui/gfx/animation/animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/animation.h
diff --git a/ui/base/animation/animation.h b/ui/gfx/animation/animation.h
similarity index 95%
rename from ui/base/animation/animation.h
rename to ui/gfx/animation/animation.h
index 361ab15dbbdf6be55e6c32f228a9ca8554a99335..fe5c5546b9413631b435f8a6ce8c740650f581e6 100644
--- a/ui/base/animation/animation.h
+++ b/ui/gfx/animation/animation.h
@@ -8,13 +8,13 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
-#include "ui/base/animation/animation_container_element.h"
+#include "ui/gfx/animation/animation_container_element.h"
namespace gfx {
class Rect;
}
-namespace ui {
+namespace gfx {
class AnimationContainer;
class AnimationDelegate;
@@ -25,7 +25,7 @@ class AnimationDelegate;
//
// To subclass override Step, which is invoked as the animation progresses and
// GetCurrentValue() to return the value appropriate to the animation.
-class UI_EXPORT Animation : public AnimationContainerElement {
+class GFX_EXPORT Animation : public AnimationContainerElement {
public:
explicit Animation(base::TimeDelta timer_interval);
virtual ~Animation();
@@ -104,6 +104,6 @@ class UI_EXPORT Animation : public AnimationContainerElement {
DISALLOW_COPY_AND_ASSIGN(Animation);
};
-} // namespace ui
+} // namespace gfx
#endif // UI_BASE_ANIMATION_ANIMATION_H_
« no previous file with comments | « ui/compositor/transform_animation_curve_adapter_unittest.cc ('k') | ui/gfx/animation/animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698