| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index 93af37a0bb24c4d2b51d9290d2b95b3f99ea5aed..fc1422470e2e513be8c55b8a9d4cc5b6f0cfb0bb 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -5,8 +5,8 @@
|
| #include "ash/wm/window_animations.h"
|
|
|
| #include <math.h>
|
| -
|
| #include <algorithm>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "ash/screen_util.h"
|
| @@ -271,8 +271,7 @@ class CrossFadeObserver : public ui::CompositorObserver,
|
| // Takes ownership of |layer| and its child layers.
|
| CrossFadeObserver(aura::Window* window,
|
| scoped_ptr<ui::LayerTreeOwner> layer_owner)
|
| - : window_(window),
|
| - layer_owner_(layer_owner.Pass()) {
|
| + : window_(window), layer_owner_(std::move(layer_owner)) {
|
| window_->AddObserver(this);
|
| layer_owner_->root()->GetCompositor()->AddObserver(this);
|
| }
|
| @@ -342,7 +341,8 @@ base::TimeDelta CrossFadeAnimation(
|
| ui::ScopedLayerAnimationSettings settings(old_layer->GetAnimator());
|
|
|
| // Animation observer owns the old layer and deletes itself.
|
| - settings.AddObserver(new CrossFadeObserver(window, old_layer_owner.Pass()));
|
| + settings.AddObserver(
|
| + new CrossFadeObserver(window, std::move(old_layer_owner)));
|
| settings.SetTransitionDuration(duration);
|
| settings.SetTweenType(tween_type);
|
| gfx::Transform out_transform;
|
|
|