summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/setting_level_bubble.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/setting_level_bubble.cc')
-rw-r--r--chrome/browser/chromeos/setting_level_bubble.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc
index 22aeced..8395673 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -67,7 +67,7 @@ SettingLevelBubble::SettingLevelBubble(SkBitmap* increase_icon,
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 @@ void SettingLevelBubble::InfoBubbleClosing(InfoBubble* info_bubble, bool) {
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_));
}
}