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

Unified Diff: ash/system/chromeos/network/network_icon_animation.cc

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 | « ash/system/chromeos/network/network_icon_animation.h ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/network_icon_animation.cc
diff --git a/ash/system/chromeos/network/network_icon_animation.cc b/ash/system/chromeos/network/network_icon_animation.cc
index 2a6428cb0c8dbda96491b1e1076ee1dda37f517a..5065745c849f1a8571ef614dc2e30f5cffc4e334 100644
--- a/ash/system/chromeos/network/network_icon_animation.cc
+++ b/ash/system/chromeos/network/network_icon_animation.cc
@@ -17,13 +17,14 @@ NetworkIconAnimation::NetworkIconAnimation()
: animation_(this) {
// Set up the animation throbber.
animation_.SetThrobDuration(kThrobDurationMs);
- animation_.SetTweenType(ui::Tween::LINEAR);
+ animation_.SetTweenType(gfx::Tween::LINEAR);
}
NetworkIconAnimation::~NetworkIconAnimation() {
}
-void NetworkIconAnimation::AnimationProgressed(const ui::Animation* animation) {
+void NetworkIconAnimation::AnimationProgressed(
+ const gfx::Animation* animation) {
if (animation != &animation_)
return;
FOR_EACH_OBSERVER(AnimationObserver, observers_, NetworkIconChanged());
« no previous file with comments | « ash/system/chromeos/network/network_icon_animation.h ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698