| Index: ui/compositor/layer_owner.cc
|
| diff --git a/ui/compositor/layer_owner.cc b/ui/compositor/layer_owner.cc
|
| index d874b4769f184d196edd39512ebfd65eb9f18ed1..c9180810ebdc94a818305256a7cdcd7c5fc3e655 100644
|
| --- a/ui/compositor/layer_owner.cc
|
| +++ b/ui/compositor/layer_owner.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/compositor/layer_owner.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ui/compositor/layer_owner_delegate.h"
|
|
|
| namespace ui {
|
| @@ -24,13 +26,13 @@ void LayerOwner::SetLayer(Layer* layer) {
|
| scoped_ptr<Layer> LayerOwner::AcquireLayer() {
|
| if (layer_owner_)
|
| layer_owner_->owner_ = NULL;
|
| - return layer_owner_.Pass();
|
| + return std::move(layer_owner_);
|
| }
|
|
|
| scoped_ptr<Layer> LayerOwner::RecreateLayer() {
|
| scoped_ptr<ui::Layer> old_layer(AcquireLayer());
|
| if (!old_layer)
|
| - return old_layer.Pass();
|
| + return old_layer;
|
|
|
| LayerDelegate* old_delegate = old_layer->delegate();
|
| old_layer->set_delegate(NULL);
|
| @@ -79,7 +81,7 @@ scoped_ptr<Layer> LayerOwner::RecreateLayer() {
|
| if (layer_owner_delegate_)
|
| layer_owner_delegate_->OnLayerRecreated(old_layer.get(), new_layer);
|
|
|
| - return old_layer.Pass();
|
| + return old_layer;
|
| }
|
|
|
| void LayerOwner::DestroyLayer() {
|
|
|