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

Unified Diff: ui/views/animation/bounds_animator_unittest.cc

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/views/animation/bounds_animator.cc ('k') | ui/views/animation/scroll_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/bounds_animator_unittest.cc
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc
index ed7dca590bfb5fc57006d559b83b619a9e0611ec..0928fe665b0ee0daa80771164391b87573c4b96f 100644
--- a/ui/views/animation/bounds_animator_unittest.cc
+++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -5,13 +5,13 @@
#include "ui/views/animation/bounds_animator.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/animation/slide_animation.h"
-#include "ui/base/animation/test_animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
+#include "ui/gfx/animation/test_animation_delegate.h"
#include "ui/views/view.h"
-using ui::Animation;
-using ui::SlideAnimation;
-using ui::TestAnimationDelegate;
+using gfx::Animation;
+using gfx::SlideAnimation;
+using gfx::TestAnimationDelegate;
namespace views {
namespace {
@@ -52,7 +52,7 @@ class OwnedDelegate : public BoundsAnimator::OwnedAnimationDelegate {
return value;
}
- // Overridden from ui::AnimationDelegate:
+ // Overridden from gfx::AnimationDelegate:
virtual void AnimationCanceled(const Animation* animation) OVERRIDE {
canceled_ = true;
}
« no previous file with comments | « ui/views/animation/bounds_animator.cc ('k') | ui/views/animation/scroll_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698