| Index: ui/aura_shell/workspace/workspace.cc
 | 
| diff --git a/ui/aura_shell/workspace/workspace.cc b/ui/aura_shell/workspace/workspace.cc
 | 
| index a9574da9617949c80f1b9afee3048f9a8699b772..f661e9279858db52ccc645ea7ab020850e66092e 100644
 | 
| --- a/ui/aura_shell/workspace/workspace.cc
 | 
| +++ b/ui/aura_shell/workspace/workspace.cc
 | 
| @@ -9,6 +9,7 @@
 | 
|  #include "ui/aura/window.h"
 | 
|  #include "ui/aura_shell/workspace/workspace_manager.h"
 | 
|  #include "ui/gfx/compositor/layer.h"
 | 
| +#include "ui/gfx/compositor/layer_animator.h"
 | 
|  
 | 
|  namespace {
 | 
|  // Horizontal margin between windows.
 | 
| @@ -211,9 +212,13 @@ void Workspace::MoveWindowTo(
 | 
|    else {
 | 
|      gfx::Rect bounds = window->GetTargetBounds();
 | 
|      bounds.set_origin(origin);
 | 
| -    if (animate)
 | 
| -      window->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
 | 
| -    window->SetBounds(bounds);
 | 
| +    if (animate) {
 | 
| +      ui::LayerAnimator::ScopedSettings settings(
 | 
| +          window->layer()->GetAnimator());
 | 
| +      window->SetBounds(bounds);
 | 
| +    } else {
 | 
| +      window->SetBounds(bounds);
 | 
| +    }
 | 
|    }
 | 
|  }
 | 
|  
 | 
| 
 |