| Index: ash/wm/workspace_controller.cc
|
| diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
|
| index 1b9fd854a17d4eee88015747dba50dfd2588e0e2..1f89908b8ab2cb6a0afedecf46cb113924013bc8 100644
|
| --- a/ash/wm/workspace_controller.cc
|
| +++ b/ash/wm/workspace_controller.cc
|
| @@ -127,12 +127,10 @@ void WorkspaceController::DoInitialAnimation() {
|
| settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
|
| viewport_->layer()->GetAnimator()->SchedulePauseForProperties(
|
| base::TimeDelta::FromMilliseconds(kInitialPauseTimeMS),
|
| - ui::LayerAnimationElement::TRANSFORM,
|
| - ui::LayerAnimationElement::OPACITY,
|
| - ui::LayerAnimationElement::BRIGHTNESS,
|
| - ui::LayerAnimationElement::VISIBILITY,
|
| - -1);
|
| -
|
| + ui::LayerAnimationElement::TRANSFORM |
|
| + ui::LayerAnimationElement::OPACITY |
|
| + ui::LayerAnimationElement::BRIGHTNESS |
|
| + ui::LayerAnimationElement::VISIBILITY);
|
| settings.SetTweenType(gfx::Tween::EASE_OUT);
|
| settings.SetTransitionDuration(
|
| base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
|
|
|