Reland r107720 - Enable the new layer animation framework.

ui/aura_shell/shell.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/shell.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/toplevel_window_container.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/desktop_layout_manager.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animator.h"
 #include "views/widget/native_widget_aura.h"
 #include "views/widget/widget.h"
 
 namespace aura_shell {
 
 namespace {
 
 using views::Widget;
 
 // Creates each of the special window containers that holds windows of various
@@ skipping 171 matching lines @@
   std::vector<WindowAndBoundsPair> bounds;
   CalculateWindowBoundsAndScaleForTiling(window_container->bounds().size(),
                                          windows, &x_scale, &y_scale, &bounds);
   if (bounds.empty())
     return;
   ui::Transform transform;
   transform.SetScale(x_scale, y_scale);
   for (size_t i = 0; i < bounds.size(); ++i) {
     to_restore_.push_back(
         std::make_pair(bounds[i].first, bounds[i].first->bounds()));
-    bounds[i].first->layer()->SetAnimation(
-        aura::Window::CreateDefaultAnimation());
+    ui::LayerAnimator::TransientSettings settings(
+        bounds[i].first->layer()->GetAnimator());
+    aura::Window::ApplyDefaultAnimationSettings(&settings);
     bounds[i].first->SetBounds(bounds[i].second);
     bounds[i].first->layer()->SetTransform(transform);
     bounds[i].first->layer()->SetOpacity(0.5f);
   }
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&Shell::RestoreTiledWindows, method_factory_.GetWeakPtr()),
       2000);
 }
 
 void Shell::RestoreTiledWindows() {
   ui::Transform identity_transform;
   for (size_t i = 0; i < to_restore_.size(); ++i) {
-    to_restore_[i].first->layer()->SetAnimation(
-        aura::Window::CreateDefaultAnimation());
+    ui::LayerAnimator::TransientSettings settings(
+        to_restore_[i].first->layer()->GetAnimator());
+    aura::Window::ApplyDefaultAnimationSettings(&settings);
     to_restore_[i].first->SetBounds(to_restore_[i].second);
     to_restore_[i].first->layer()->SetTransform(identity_transform);
     to_restore_[i].first->layer()->SetOpacity(1.0f);
   }
   to_restore_.clear();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::DesktopDelegate implementation:
 
@@ skipping 21 matching lines @@
 }
 
 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {
   const aura::ToplevelWindowContainer* container =
       GetContainer(internal::kShellWindowId_DefaultContainer)->
           AsToplevelWindowContainer();
   return container->GetTopmostWindowToActivate(ignore);
 }
 
 }  // namespace aura_shell