Index: chrome/browser/chromeos/setting_level_bubble.cc |
=================================================================== |
--- chrome/browser/chromeos/setting_level_bubble.cc (revision 70685) |
+++ chrome/browser/chromeos/setting_level_bubble.cc (working copy) |
@@ -67,7 +67,7 @@ |
view_(NULL), |
animation_(this) { |
animation_.SetSlideDuration(kAnimationDurationMs); |
- animation_.SetTweenType(Tween::LINEAR); |
+ animation_.SetTweenType(ui::Tween::LINEAR); |
} |
void SettingLevelBubble::ShowBubble(int percent) { |
@@ -136,16 +136,16 @@ |
view_ = NULL; |
} |
-void SettingLevelBubble::AnimationEnded(const Animation* animation) { |
+void SettingLevelBubble::AnimationEnded(const ui::Animation* animation) { |
previous_percent_ = current_percent_; |
} |
-void SettingLevelBubble::AnimationProgressed(const Animation* animation) { |
+void SettingLevelBubble::AnimationProgressed(const ui::Animation* animation) { |
if (view_) { |
view_->Update( |
- Tween::ValueBetween(animation->GetCurrentValue(), |
- previous_percent_, |
- current_percent_)); |
+ ui::Tween::ValueBetween(animation->GetCurrentValue(), |
+ previous_percent_, |
+ current_percent_)); |
} |
} |