Index: athena/home/athena_start_page_view.cc |
diff --git a/athena/home/athena_start_page_view.cc b/athena/home/athena_start_page_view.cc |
index 098b141277c37b57e2bf3e1501b497a4215c4c2d..4a6510067d69b9cdd68a41947e45cc6da20d13f7 100644 |
--- a/athena/home/athena_start_page_view.cc |
+++ b/athena/home/athena_start_page_view.cc |
@@ -246,7 +246,9 @@ void AthenaStartPageView::SetLayoutState(float layout_state) { |
Layout(); |
} |
-void AthenaStartPageView::SetLayoutStateWithAnimation(float layout_state) { |
+void AthenaStartPageView::SetLayoutStateWithAnimation( |
+ float layout_state, |
+ gfx::Tween::Type tween_type) { |
ui::ScopedLayerAnimationSettings system_info( |
system_info_view_->layer()->GetAnimator()); |
ui::ScopedLayerAnimationSettings logo(logo_->layer()->GetAnimator()); |
@@ -257,11 +259,11 @@ void AthenaStartPageView::SetLayoutStateWithAnimation(float layout_state) { |
ui::ScopedLayerAnimationSettings controls( |
control_icon_container_->layer()->GetAnimator()); |
- system_info.SetTweenType(gfx::Tween::EASE_IN_OUT); |
- logo.SetTweenType(gfx::Tween::EASE_IN_OUT); |
- search_box.SetTweenType(gfx::Tween::EASE_IN_OUT); |
- icons.SetTweenType(gfx::Tween::EASE_IN_OUT); |
- controls.SetTweenType(gfx::Tween::EASE_IN_OUT); |
+ system_info.SetTweenType(tween_type); |
+ logo.SetTweenType(tween_type); |
+ search_box.SetTweenType(tween_type); |
+ icons.SetTweenType(tween_type); |
+ controls.SetTweenType(tween_type); |
SetLayoutState(layout_state); |
} |