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

Unified Diff: chrome/browser/extensions/extension_action.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/download/download_shelf.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_action.h
diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h
index c7f1fac5e67e75b217f187e13019e37750782604..7883f1b49c664527ab8a2909aa92e0fb02694309 100644
--- a/chrome/browser/extensions/extension_action.h
+++ b/chrome/browser/extensions/extension_action.h
@@ -20,7 +20,7 @@
#include "third_party/skia/include/core/SkColor.h"
// TODO(robertphillips): change this to "class SkBaseDevice;"
#include "third_party/skia/include/core/SkDevice.h"
-#include "ui/base/animation/linear_animation.h"
+#include "ui/gfx/animation/linear_animation.h"
class GURL;
class SkBitmap;
@@ -54,7 +54,7 @@ class ExtensionAction {
};
// A fade-in animation.
- class IconAnimation : public ui::LinearAnimation {
+ class IconAnimation : public gfx::LinearAnimation {
public:
// Observes changes to icon animation state.
class Observer {
@@ -100,7 +100,7 @@ class ExtensionAction {
base::WeakPtr<IconAnimation> AsWeakPtr();
- // ui::LinearAnimation implementation.
+ // gfx::LinearAnimation implementation.
virtual void AnimateToState(double state) OVERRIDE;
// Device we use to paint icons to.
« no previous file with comments | « chrome/browser/download/download_shelf.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698