| Index: ui/aura_shell/shell.cc
|
| diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
|
| index aa2798dfdb732ad61c5f502417c5cb9810e0aaf0..a4c091f7bca3c133fde601761c12fa6cb58862d1 100644
|
| --- a/ui/aura_shell/shell.cc
|
| +++ b/ui/aura_shell/shell.cc
|
| @@ -18,6 +18,7 @@
|
| #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"
|
|
|
| @@ -209,8 +210,9 @@ void Shell::TileWindows() {
|
| 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);
|
| @@ -225,8 +227,9 @@ void Shell::TileWindows() {
|
| 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);
|
|
|