| Index: ui/aura_shell/workspace/workspace_manager.cc
|
| ===================================================================
|
| --- ui/aura_shell/workspace/workspace_manager.cc (revision 107719)
|
| +++ ui/aura_shell/workspace/workspace_manager.cc (working copy)
|
| @@ -131,7 +131,7 @@
|
| transform.SetTranslateX(-active_workspace_->bounds().x());
|
| }
|
|
|
| - ui::LayerAnimator::ScopedSettings settings(viewport_->layer()->GetAnimator());
|
| + viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
|
| viewport_->layer()->SetTransform(transform);
|
| }
|
|
|
| @@ -247,8 +247,7 @@
|
| if (active_workspace_) {
|
| ui::Transform transform;
|
| transform.SetTranslateX(-active_workspace_->bounds().x());
|
| - ui::LayerAnimator::ScopedSettings settings(
|
| - viewport_->layer()->GetAnimator());
|
| + viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
|
| viewport_->SetTransform(transform);
|
| }
|
| }
|
|
|