Index: chrome/browser/chromeos/panels/panel_scroller.cc |
=================================================================== |
--- chrome/browser/chromeos/panels/panel_scroller.cc (revision 70685) |
+++ chrome/browser/chromeos/panels/panel_scroller.cc (working copy) |
@@ -27,7 +27,7 @@ |
ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)), |
animated_scroll_begin_(0), |
animated_scroll_end_(0) { |
- animation_.SetTweenType(Tween::EASE_IN_OUT); |
+ animation_.SetTweenType(ui::Tween::EASE_IN_OUT); |
animation_.SetSlideDuration(300); |
Panel* panel = new Panel; |
@@ -238,7 +238,7 @@ |
animation_.Show(); |
} |
-void PanelScroller::AnimationProgressed(const Animation* animation) { |
+void PanelScroller::AnimationProgressed(const ui::Animation* animation) { |
scroll_pos_ = static_cast<int>( |
static_cast<double>(animated_scroll_end_ - animated_scroll_begin_) * |
animation_.GetCurrentValue()) + animated_scroll_begin_; |