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 4a6ecaa7ee52f81381c2be1ffd637e85cbe0b173..c8904ea695d310abf48015158891112a05e3634b 100644 |
--- a/ui/aura_shell/workspace/workspace_manager.cc |
+++ b/ui/aura_shell/workspace/workspace_manager.cc |
@@ -131,7 +131,7 @@ void WorkspaceManager::SetOverview(bool overview) { |
transform.SetTranslateX(-active_workspace_->bounds().x()); |
} |
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation()); |
+ ui::LayerAnimator::ScopedSettings settings(viewport_->layer()->GetAnimator()); |
viewport_->layer()->SetTransform(transform); |
} |
@@ -247,7 +247,8 @@ void WorkspaceManager::UpdateViewport() { |
if (active_workspace_) { |
ui::Transform transform; |
transform.SetTranslateX(-active_workspace_->bounds().x()); |
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation()); |
+ ui::LayerAnimator::ScopedSettings settings( |
+ viewport_->layer()->GetAnimator()); |
viewport_->SetTransform(transform); |
} |
} |