Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: ash/wm/window_animations.cc

Issue 1547223002: Convert Pass()→std::move() in //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/window_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ash/wm/panels/panel_layout_manager.cc ('k') | ash/wm/window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698