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

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

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/notifications/balloon_view_gtk.cc ('k') | chrome/browser/gtk/slide_animator_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/slide_animator_gtk.h
===================================================================
--- chrome/browser/gtk/slide_animator_gtk.h (revision 70685)
+++ chrome/browser/gtk/slide_animator_gtk.h (working copy)
@@ -17,13 +17,15 @@
#include <gtk/gtk.h>
-#include "app/animation_delegate.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "ui/base/animation/animation_delegate.h"
+namespace ui {
class SlideAnimation;
+}
-class SlideAnimatorGtk : public AnimationDelegate {
+class SlideAnimatorGtk : public ui::AnimationDelegate {
public:
class Delegate {
public:
@@ -82,9 +84,9 @@
// animation.
bool IsAnimating();
- // AnimationDelegate implementation.
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationEnded(const Animation* animation);
+ // ui::AnimationDelegate implementation.
+ virtual void AnimationProgressed(const ui::Animation* animation);
+ virtual void AnimationEnded(const ui::Animation* animation);
// Used during testing; disable or enable animations (default is enabled).
static void SetAnimationsForTesting(bool enable);
@@ -94,7 +96,7 @@
GtkAllocation* allocation,
SlideAnimatorGtk* slider);
- scoped_ptr<SlideAnimation> animation_;
+ scoped_ptr<ui::SlideAnimation> animation_;
// The top level widget of the SlideAnimatorGtk. It is a GtkFixed.
OwnedWidgetGtk widget_;
« no previous file with comments | « chrome/browser/gtk/notifications/balloon_view_gtk.cc ('k') | chrome/browser/gtk/slide_animator_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698