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

Unified Diff: chrome/browser/gtk/slide_animator_gtk.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/gtk/slide_animator_gtk.h ('k') | chrome/browser/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/gtk/slide_animator_gtk.cc
===================================================================
--- chrome/browser/gtk/slide_animator_gtk.cc (revision 70685)
+++ chrome/browser/gtk/slide_animator_gtk.cc (working copy)
@@ -4,10 +4,9 @@
#include "chrome/browser/gtk/slide_animator_gtk.h"
-#include "app/animation.h"
-#include "app/slide_animation.h"
-
#include "chrome/browser/gtk/gtk_expanded_container.h"
+#include "ui/base/animation/animation.h"
+#include "ui/base/animation/slide_animation.h"
namespace {
@@ -56,10 +55,10 @@
child_needs_move_ = (direction == DOWN);
- animation_.reset(new SlideAnimation(this));
+ animation_.reset(new ui::SlideAnimation(this));
// Default tween type is EASE_OUT.
if (linear)
- animation_->SetTweenType(Tween::LINEAR);
+ animation_->SetTweenType(ui::Tween::LINEAR);
if (duration != 0)
animation_->SetSlideDuration(duration);
}
@@ -113,7 +112,7 @@
return animation_->is_animating();
}
-void SlideAnimatorGtk::AnimationProgressed(const Animation* animation) {
+void SlideAnimatorGtk::AnimationProgressed(const ui::Animation* animation) {
GtkRequisition req;
gtk_widget_size_request(child_, &req);
@@ -127,7 +126,7 @@
gtk_widget_set_size_request(widget_.get(), -1, showing_height);
}
-void SlideAnimatorGtk::AnimationEnded(const Animation* animation) {
+void SlideAnimatorGtk::AnimationEnded(const ui::Animation* animation) {
if (!animation_->IsShowing()) {
gtk_widget_hide(widget_.get());
if (delegate_)
« no previous file with comments | « chrome/browser/gtk/slide_animator_gtk.h ('k') | chrome/browser/gtk/status_bubble_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698