Index: chrome/browser/ui/views/notifications/balloon_view.cc |
=================================================================== |
--- chrome/browser/ui/views/notifications/balloon_view.cc (revision 70685) |
+++ chrome/browser/ui/views/notifications/balloon_view.cc (working copy) |
@@ -8,7 +8,6 @@ |
#include "app/l10n_util.h" |
#include "app/resource_bundle.h" |
-#include "app/slide_animation.h" |
#include "base/message_loop.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/notifications/balloon.h" |
@@ -29,6 +28,7 @@ |
#include "gfx/native_widget_types.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
+#include "ui/base/animation/slide_animation.h" |
#include "views/controls/button/button.h" |
#include "views/controls/button/image_button.h" |
#include "views/controls/button/text_button.h" |
@@ -213,7 +213,7 @@ |
balloon_->GetPosition().x(), balloon_->GetPosition().y(), |
GetTotalWidth(), GetTotalHeight()); |
frame_container_->GetBounds(&anim_frame_start_, false); |
- animation_.reset(new SlideAnimation(this)); |
+ animation_.reset(new ui::SlideAnimation(this)); |
animation_->Show(); |
} |
@@ -224,7 +224,7 @@ |
balloon_->notification().content_url()); |
} |
-void BalloonViewImpl::AnimationProgressed(const Animation* animation) { |
+void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) { |
DCHECK(animation == animation_.get()); |
// Linear interpolation from start to end position. |