| Index: ui/aura_shell/workspace/workspace_manager.cc
|
| diff --git a/ui/aura_shell/workspace/workspace_manager.cc b/ui/aura_shell/workspace/workspace_manager.cc
|
| index 410ace11474528ced8138181083bd90fb09c7f42..89fbe5339b05b9102419cec8379ae8aa49efe1d5 100644
|
| --- a/ui/aura_shell/workspace/workspace_manager.cc
|
| +++ b/ui/aura_shell/workspace/workspace_manager.cc
|
| @@ -117,7 +117,8 @@ void WorkspaceManager::SetOverview(bool overview) {
|
| transform.SetTranslateX(-active_workspace_->bounds().x());
|
| }
|
|
|
| - viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
|
| + aura::Window::ScopedAnimationSettings settings(
|
| + viewport_->layer()->GetAnimator());
|
| viewport_->layer()->SetTransform(transform);
|
| }
|
|
|
| @@ -192,7 +193,8 @@ void WorkspaceManager::UpdateViewport() {
|
| if (active_workspace_) {
|
| ui::Transform transform;
|
| transform.SetTranslateX(-active_workspace_->bounds().x());
|
| - viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
|
| + aura::Window::ScopedAnimationSettings settings(
|
| + viewport_->layer()->GetAnimator());
|
| viewport_->SetTransform(transform);
|
| }
|
| }
|
|
|