Reland r107720 - Enable the new layer animation framework.

ui/aura_shell/workspace/workspace.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura_shell/workspace/workspace.h"
 
 #include "base/logging.h"
 #include "ui/aura/desktop.h"
 #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.
 const int kWindowHorizontalMargin = 10;
 
 // Maximum number of windows a workspace can have.
 size_t g_max_windows_per_workspace = 2;
 }
 
 namespace aura_shell {
@@ skipping 182 matching lines @@
     aura::Window* window,
     const gfx::Point& origin,
     bool animate) {
   if (window->show_state() == ui::SHOW_STATE_FULLSCREEN)
     window->Fullscreen();
   else if (window->show_state() == ui::SHOW_STATE_MAXIMIZED)
     window->Maximize();
   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);
+    }
   }
 }
 
 int Workspace::GetTotalWindowsWidth() const {
   int total_width = 0;
   for (aura::Window::Windows::const_iterator i = windows_.begin();
        i != windows_.end();
        ++i) {
     if (total_width)
       total_width += kWindowHorizontalMargin;
     // TODO(oshima): use restored bounds.
     total_width += (*i)->bounds().width();
   }
   return total_width;
 }
 
 // static
 size_t Workspace::SetMaxWindowsCount(size_t max) {
   int old = g_max_windows_per_workspace;
   g_max_windows_per_workspace = max;
   return old;
 }
 
 }  // namespace aura_shell