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

Unified Diff: chrome/browser/gtk/hover_controller_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/download_started_animation_gtk.cc ('k') | chrome/browser/gtk/hover_controller_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/hover_controller_gtk.h
===================================================================
--- chrome/browser/gtk/hover_controller_gtk.h (revision 70685)
+++ chrome/browser/gtk/hover_controller_gtk.h (working copy)
@@ -8,17 +8,17 @@
#include <gtk/gtk.h>
-#include "app/animation_delegate.h"
#include "app/gtk_signal.h"
#include "app/gtk_signal_registrar.h"
-#include "app/slide_animation.h"
-#include "app/throb_animation.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
+#include "ui/base/animation/throb_animation.h"
// This class handles the "throbbing" of a GtkChromeButton. The visual effect
// of throbbing is created by painting partially transparent hover effects. It
// only works in non-gtk theme mode. This class mainly exists to glue an
// AnimationDelegate (C++ class) to a GtkChromeButton* (GTK/c object).
-class HoverControllerGtk : public AnimationDelegate {
+class HoverControllerGtk : public ui::AnimationDelegate {
public:
virtual ~HoverControllerGtk();
@@ -42,10 +42,10 @@
private:
explicit HoverControllerGtk(GtkWidget* button);
- // Overridden from AnimationDelegate.
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationEnded(const Animation* animation);
- virtual void AnimationCanceled(const Animation* animation);
+ // Overridden from ui::AnimationDelegate.
+ virtual void AnimationProgressed(const ui::Animation* animation);
+ virtual void AnimationEnded(const ui::Animation* animation);
+ virtual void AnimationCanceled(const ui::Animation* animation);
CHROMEGTK_CALLBACK_1(HoverControllerGtk, gboolean, OnEnter,
GdkEventCrossing*);
@@ -55,8 +55,8 @@
GtkWidget*);
CHROMEGTK_CALLBACK_0(HoverControllerGtk, void, OnDestroy);
- ThrobAnimation throb_animation_;
- SlideAnimation hover_animation_;
+ ui::ThrobAnimation throb_animation_;
+ ui::SlideAnimation hover_animation_;
GtkWidget* button_;
GtkSignalRegistrar signals_;
« no previous file with comments | « chrome/browser/gtk/download_started_animation_gtk.cc ('k') | chrome/browser/gtk/hover_controller_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698