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

Unified Diff: chrome/browser/ui/gtk/infobars/translate_infobar_base_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/infobars/translate_infobar_base_gtk.h
diff --git a/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h b/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h
index 43fa8532431ac2a4c834a07794e6303d04ba8277..863c7eb9bb509c4b0b1b375bf31bff03d456e9f6 100644
--- a/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h
+++ b/chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.h
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
class TranslateInfoBarDelegate;
@@ -20,7 +20,7 @@ class TranslateInfoBarBase : public InfoBarGtk {
virtual ~TranslateInfoBarBase();
// InfoBarGtk:
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+ virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
virtual void GetTopColor(InfoBarDelegate::Type type,
double* r, double* g, double* b) OVERRIDE;
virtual void GetBottomColor(InfoBarDelegate::Type type,
@@ -65,7 +65,7 @@ class TranslateInfoBarBase : public InfoBarGtk {
double background_error_percent_;
// Changes the color of the background from normal to error color and back.
- scoped_ptr<ui::SlideAnimation> background_color_animation_;
+ scoped_ptr<gfx::SlideAnimation> background_color_animation_;
// The model for the current menu displayed.
scoped_ptr<ui::MenuModel> menu_model_;
« no previous file with comments | « chrome/browser/ui/gtk/hover_controller_gtk.cc ('k') | chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698