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

Unified Diff: chrome/browser/ui/gtk/slide_animator_gtk.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 | « chrome/browser/ui/gtk/slide_animator_gtk.h ('k') | chrome/browser/ui/gtk/status_bubble_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/slide_animator_gtk.cc
diff --git a/chrome/browser/ui/gtk/slide_animator_gtk.cc b/chrome/browser/ui/gtk/slide_animator_gtk.cc
index 81936095cb95e50b3fda619913a0f422b3041ea9..7e9b3eca8e5adf907306affecaf8bf0125e5afdf 100644
--- a/chrome/browser/ui/gtk/slide_animator_gtk.cc
+++ b/chrome/browser/ui/gtk/slide_animator_gtk.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
-#include "ui/base/animation/animation.h"
-#include "ui/base/animation/slide_animation.h"
#include "ui/base/gtk/gtk_expanded_container.h"
+#include "ui/gfx/animation/animation.h"
+#include "ui/gfx/animation/slide_animation.h"
namespace {
@@ -55,10 +55,10 @@ SlideAnimatorGtk::SlideAnimatorGtk(GtkWidget* child,
child_needs_move_ = (direction == DOWN);
- animation_.reset(new ui::SlideAnimation(this));
+ animation_.reset(new gfx::SlideAnimation(this));
// Default tween type is EASE_OUT.
if (linear)
- animation_->SetTweenType(ui::Tween::LINEAR);
+ animation_->SetTweenType(gfx::Tween::LINEAR);
if (duration != 0)
animation_->SetSlideDuration(duration);
}
@@ -112,7 +112,7 @@ bool SlideAnimatorGtk::IsAnimating() {
return animation_->is_animating();
}
-void SlideAnimatorGtk::AnimationProgressed(const ui::Animation* animation) {
+void SlideAnimatorGtk::AnimationProgressed(const gfx::Animation* animation) {
GtkRequisition req;
gtk_widget_size_request(child_, &req);
@@ -128,7 +128,7 @@ void SlideAnimatorGtk::AnimationProgressed(const ui::Animation* animation) {
gtk_widget_set_size_request(widget_.get(), -1, showing_height);
}
-void SlideAnimatorGtk::AnimationEnded(const ui::Animation* animation) {
+void SlideAnimatorGtk::AnimationEnded(const gfx::Animation* animation) {
if (!animation_->IsShowing()) {
gtk_widget_hide(widget_.get());
if (delegate_)
« no previous file with comments | « chrome/browser/ui/gtk/slide_animator_gtk.h ('k') | chrome/browser/ui/gtk/status_bubble_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698