diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 17:33:39 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 17:33:39 +0000 |
commit | f676780687464428e340d008a0d1ca13d9944628 (patch) | |
tree | 489e8bd8188e31a7f6c53f15e8d1d9c6ba36d023 /chrome/browser/gtk/notifications/balloon_view_gtk.cc | |
parent | 3b65bfd55c56cf8a6db025087d937494f49dc15f (diff) | |
download | chromium_src-f676780687464428e340d008a0d1ca13d9944628.zip chromium_src-f676780687464428e340d008a0d1ca13d9944628.tar.gz chromium_src-f676780687464428e340d008a0d1ca13d9944628.tar.bz2 |
Move animation code to new ui/base/animation directory.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6154001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/notifications/balloon_view_gtk.cc')
-rw-r--r-- | chrome/browser/gtk/notifications/balloon_view_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index bbca070..edb475e 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -11,7 +11,6 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/slide_animation.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" @@ -43,6 +42,7 @@ #include "gfx/native_widget_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/animation/slide_animation.h" namespace { @@ -163,11 +163,11 @@ void BalloonViewImpl::RepositionToBalloon() { anim_frame_start_ = gfx::Rect(start_x, start_y, start_w, start_h); anim_frame_end_ = gfx::Rect(end_x, end_y, end_w, end_h); - animation_.reset(new SlideAnimation(this)); + animation_.reset(new ui::SlideAnimation(this)); animation_->Show(); } -void BalloonViewImpl::AnimationProgressed(const Animation* animation) { +void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) { DCHECK_EQ(animation, animation_.get()); // Linear interpolation from start to end position. |