diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-15 17:29:30 +0000 |
commit | ffb15d1eb8fc4180b30b43865fc44427f29cd578 (patch) | |
tree | ea89569dc78f3a5a103dfb7eef8a4b5bc8879268 /ash/drag_drop/drag_drop_controller_unittest.cc | |
parent | 70cdf8d473698e4f9203dde64bfa9147dc4d70e7 (diff) | |
download | chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.zip chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.gz chromium_src-ffb15d1eb8fc4180b30b43865fc44427f29cd578.tar.bz2 |
ui/base/animation -> ui/gfx/animation
I also made GFX_EXPORT real, which is ok since it's the same as
UI_EXPORT. It'll only matter when we separate out at gyp level.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/23531053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller_unittest.cc')
-rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 7ca79ea0..ce4e752 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -14,7 +14,6 @@ #include "ui/aura/client/capture_client.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" -#include "ui/base/animation/linear_animation.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/dragdrop/drag_drop_types.h" @@ -24,6 +23,7 @@ #include "ui/base/events/event_utils.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_base_switches.h" +#include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/view.h" @@ -130,12 +130,12 @@ class DragTestView : public views::View { DISALLOW_COPY_AND_ASSIGN(DragTestView); }; -class CompletableLinearAnimation : public ui::LinearAnimation { +class CompletableLinearAnimation : public gfx::LinearAnimation { public: CompletableLinearAnimation(int duration, int frame_rate, - ui::AnimationDelegate* delegate) - : ui::LinearAnimation(duration, frame_rate, delegate), + gfx::AnimationDelegate* delegate) + : gfx::LinearAnimation(duration, frame_rate, delegate), duration_(duration) { } @@ -191,10 +191,10 @@ class TestDragDropController : public internal::DragDropController { drag_canceled_ = true; } - virtual ui::LinearAnimation* CreateCancelAnimation( + virtual gfx::LinearAnimation* CreateCancelAnimation( int duration, int frame_rate, - ui::AnimationDelegate* delegate) OVERRIDE { + gfx::AnimationDelegate* delegate) OVERRIDE { return new CompletableLinearAnimation(duration, frame_rate, delegate); } |