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

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

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
Index: chrome/browser/ui/gtk/slide_animator_gtk.h
diff --git a/chrome/browser/ui/gtk/slide_animator_gtk.h b/chrome/browser/ui/gtk/slide_animator_gtk.h
index 422068c91a1ab23fbc51ece8bd99b44a7cbb20ac..a73a6a049a7f4681d076acdcf799e59c958b7229 100644
--- a/chrome/browser/ui/gtk/slide_animator_gtk.h
+++ b/chrome/browser/ui/gtk/slide_animator_gtk.h
@@ -18,14 +18,14 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/base/animation/animation_delegate.h"
#include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/gfx/animation/animation_delegate.h"
-namespace ui {
+namespace gfx {
class SlideAnimation;
}
-class SlideAnimatorGtk : public ui::AnimationDelegate {
+class SlideAnimatorGtk : public gfx::AnimationDelegate {
public:
class Delegate {
public:
@@ -84,9 +84,9 @@ class SlideAnimatorGtk : public ui::AnimationDelegate {
// animation.
bool IsAnimating();
- // ui::AnimationDelegate implementation.
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+ // gfx::AnimationDelegate implementation.
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
// Used during testing; disable or enable animations (default is enabled).
static void SetAnimationsForTesting(bool enable);
@@ -96,7 +96,7 @@ class SlideAnimatorGtk : public ui::AnimationDelegate {
GtkAllocation* allocation,
SlideAnimatorGtk* slider);
- scoped_ptr<ui::SlideAnimation> animation_;
+ scoped_ptr<gfx::SlideAnimation> animation_;
// The top level widget of the SlideAnimatorGtk. It is a GtkFixed.
ui::OwnedWidgetGtk widget_;
« no previous file with comments | « chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc ('k') | chrome/browser/ui/gtk/slide_animator_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698