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

Unified Diff: ui/gfx/animation/multi_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/linear_animation.cc ('k') | ui/gfx/animation/multi_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/multi_animation.h
diff --git a/ui/base/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h
similarity index 94%
rename from ui/base/animation/multi_animation.h
rename to ui/gfx/animation/multi_animation.h
index cbe36c4c7522558168d1d9539f9e1a5af8b7f3e3..8fd05424c4ec7d0261816611eaf028493454c05a 100644
--- a/ui/base/animation/multi_animation.h
+++ b/ui/gfx/animation/multi_animation.h
@@ -7,16 +7,16 @@
#include <vector>
-#include "ui/base/animation/animation.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/animation.h"
+#include "ui/gfx/animation/tween.h"
-namespace ui {
+namespace gfx {
// MultiAnimation is an animation that consists of a number of sub animations.
// To create a MultiAnimation pass in the parts, invoke Start() and the delegate
// is notified as the animation progresses. By default MultiAnimation runs until
// Stop is invoked, see |set_continuous()| for details.
-class UI_EXPORT MultiAnimation : public Animation {
+class GFX_EXPORT MultiAnimation : public Animation {
public:
// Defines part of the animation. Each part consists of the following:
//
@@ -91,6 +91,6 @@ class UI_EXPORT MultiAnimation : public Animation {
DISALLOW_COPY_AND_ASSIGN(MultiAnimation);
};
-} // namespace ui
+} // namespace gfx
#endif // UI_BASE_ANIMATION_MULTI_ANIMATION_H_
« no previous file with comments | « ui/gfx/animation/linear_animation.cc ('k') | ui/gfx/animation/multi_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698