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

Unified Diff: ui/views/bubble/bubble_delegate.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/bubble/bubble_delegate.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/bubble_delegate.cc
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 5eb994395251a7a5a34218fe6b87f3287298c9e9..335cd9b9fbf36f4dd37352d5190c14b02a9ff5a6 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -4,7 +4,7 @@
#include "ui/views/bubble/bubble_delegate.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/rect.h"
#include "ui/native_theme/native_theme.h"
@@ -270,7 +270,7 @@ void BubbleDelegateView::StartFade(bool fade_in) {
else
GetWidget()->Close();
#else
- fade_animation_.reset(new ui::SlideAnimation(this));
+ fade_animation_.reset(new gfx::SlideAnimation(this));
fade_animation_->SetSlideDuration(GetFadeDuration());
fade_animation_->Reset(fade_in ? 0.0 : 1.0);
if (fade_in) {
@@ -323,7 +323,7 @@ void BubbleDelegateView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
UpdateColorsFromTheme(theme);
}
-void BubbleDelegateView::AnimationEnded(const ui::Animation* animation) {
+void BubbleDelegateView::AnimationEnded(const gfx::Animation* animation) {
if (animation != fade_animation_.get())
return;
bool closed = fade_animation_->GetCurrentValue() == 0;
@@ -332,7 +332,7 @@ void BubbleDelegateView::AnimationEnded(const ui::Animation* animation) {
GetWidget()->Close();
}
-void BubbleDelegateView::AnimationProgressed(const ui::Animation* animation) {
+void BubbleDelegateView::AnimationProgressed(const gfx::Animation* animation) {
if (animation != fade_animation_.get())
return;
DCHECK(fade_animation_->is_animating());
« no previous file with comments | « ui/views/bubble/bubble_delegate.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698