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

Unified Diff: ui/gfx/animation/throb_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/test_animation_delegate.h ('k') | ui/gfx/animation/throb_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/throb_animation.h
diff --git a/ui/base/animation/throb_animation.h b/ui/gfx/animation/throb_animation.h
similarity index 93%
rename from ui/base/animation/throb_animation.h
rename to ui/gfx/animation/throb_animation.h
index 4292eee81f166a557c6ca7b8b73909120bbe8f59..1d14725a8b1a0880174f25d4adca018bc4c24b3e 100644
--- a/ui/base/animation/throb_animation.h
+++ b/ui/gfx/animation/throb_animation.h
@@ -5,9 +5,9 @@
#ifndef UI_BASE_ANIMATION_THROB_ANIMATION_H_
#define UI_BASE_ANIMATION_THROB_ANIMATION_H_
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
-namespace ui {
+namespace gfx {
// A subclass of SlideAnimation that can continually slide. All of the Animation
// methods behave like that of SlideAnimation: transition to the next state.
@@ -16,7 +16,7 @@ namespace ui {
//
// A ThrobAnimation has two durations: the duration used when behavior like
// a SlideAnimation, and the duration used when throbbing.
-class UI_EXPORT ThrobAnimation : public SlideAnimation {
+class GFX_EXPORT ThrobAnimation : public SlideAnimation {
public:
explicit ThrobAnimation(AnimationDelegate* target);
virtual ~ThrobAnimation() {}
@@ -64,6 +64,6 @@ class UI_EXPORT ThrobAnimation : public SlideAnimation {
DISALLOW_COPY_AND_ASSIGN(ThrobAnimation);
};
-} // namespace ui
+} // namespace gfx
#endif // UI_BASE_ANIMATION_THROB_ANIMATION_H_
« no previous file with comments | « ui/gfx/animation/test_animation_delegate.h ('k') | ui/gfx/animation/throb_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698