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

Unified Diff: chrome/browser/ui/gtk/throbber_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
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc ('k') | chrome/browser/ui/gtk/throbber_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/throbber_gtk.h
diff --git a/chrome/browser/ui/gtk/throbber_gtk.h b/chrome/browser/ui/gtk/throbber_gtk.h
index c13e81d756bec594c9c9afc8c023c4f1d8c5c58a..fd03bdec8f40dbe3c6c000920332a9b50569b163 100644
--- a/chrome/browser/ui/gtk/throbber_gtk.h
+++ b/chrome/browser/ui/gtk/throbber_gtk.h
@@ -10,17 +10,17 @@
#include "base/compiler_specific.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/image/image.h"
class GtkThemeService;
class SkBitmap;
// An animating throbber.
-class ThrobberGtk : public ui::AnimationDelegate,
+class ThrobberGtk : public gfx::AnimationDelegate,
public content::NotificationObserver {
public:
// |theme_service| must not be NULL.
@@ -33,9 +33,9 @@ class ThrobberGtk : public ui::AnimationDelegate,
GtkWidget* widget() const { return widget_.get(); }
- // ui::AnimationDelegate implementation.
- virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+ // gfx::AnimationDelegate implementation.
+ virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
@@ -60,7 +60,7 @@ class ThrobberGtk : public ui::AnimationDelegate,
ui::OwnedWidgetGtk widget_;
// A linear animation over the loaded frames.
- ui::SlideAnimation animation_;
+ gfx::SlideAnimation animation_;
// The image containing the throbber frames.
gfx::Image frames_;
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc ('k') | chrome/browser/ui/gtk/throbber_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698