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

Unified Diff: chrome/browser/gtk/infobar_arrow_model.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/hover_controller_gtk.cc ('k') | chrome/browser/gtk/infobar_arrow_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/infobar_arrow_model.h
===================================================================
--- chrome/browser/gtk/infobar_arrow_model.h (revision 70685)
+++ chrome/browser/gtk/infobar_arrow_model.h (working copy)
@@ -7,9 +7,9 @@
#include <gtk/gtk.h>
-#include "app/animation_delegate.h"
-#include "app/slide_animation.h"
#include "third_party/skia/include/core/SkPaint.h"
+#include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
namespace gfx {
class Point;
@@ -19,7 +19,7 @@
// A helper class that tracks the state of an infobar arrow and provides a
// utility to draw it.
-class InfoBarArrowModel : public AnimationDelegate {
+class InfoBarArrowModel : public ui::AnimationDelegate {
public:
class Observer {
public:
@@ -44,10 +44,10 @@
const gfx::Point& origin,
const GdkColor& border_color);
- // Overridden from AnimationDelegate.
- virtual void AnimationEnded(const Animation* animation);
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationCanceled(const Animation* animation);
+ // Overridden from ui::AnimationDelegate.
+ virtual void AnimationEnded(const ui::Animation* animation);
+ virtual void AnimationProgressed(const ui::Animation* animation);
+ virtual void AnimationCanceled(const ui::Animation* animation);
private:
// A pair of colors used to draw a gradient for an arrow.
@@ -65,7 +65,7 @@
// An animation that tracks the progress of the transition from the last color
// to the new color.
- SlideAnimation animation_;
+ ui::SlideAnimation animation_;
// The color we are animating towards.
InfoBarColors target_colors_;
« no previous file with comments | « chrome/browser/gtk/hover_controller_gtk.cc ('k') | chrome/browser/gtk/infobar_arrow_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698