Index: ash/shelf/shelf_layout_manager.cc |
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
index 84fef37d56675d892fe39102a8e48de23a00915c..0d94aa48c19d4c4b01aa87d1e49eb4e569163a55 100644 |
--- a/ash/shelf/shelf_layout_manager.cc |
+++ b/ash/shelf/shelf_layout_manager.cc |
@@ -663,12 +663,12 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity( |
if (animate) { |
launcher_animation_setter.SetTransitionDuration( |
base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
- launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT); |
+ launcher_animation_setter.SetTweenType(gfx::Tween::EASE_OUT); |
launcher_animation_setter.SetPreemptionStrategy( |
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
status_animation_setter.SetTransitionDuration( |
base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
- status_animation_setter.SetTweenType(ui::Tween::EASE_OUT); |
+ status_animation_setter.SetTweenType(gfx::Tween::EASE_OUT); |
status_animation_setter.SetPreemptionStrategy( |
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
} else { |