Index: ui/compositor/layer_owner.h |
diff --git a/ui/compositor/layer_owner.h b/ui/compositor/layer_owner.h |
index 5e19df451fc7a497147507d2fd248ea75ff100b4..fd0606c442b4a81b57a8e912d26865b2f48fdcfa 100644 |
--- a/ui/compositor/layer_owner.h |
+++ b/ui/compositor/layer_owner.h |
@@ -5,9 +5,10 @@ |
#ifndef UI_COMPOSITOR_LAYER_OWNER_H_ |
#define UI_COMPOSITOR_LAYER_OWNER_H_ |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/compositor/compositor_export.h" |
#include "ui/compositor/layer.h" |
@@ -27,14 +28,14 @@ class COMPOSITOR_EXPORT LayerOwner { |
// function, and the caller is then responsible for disposing of the layer |
// once any animation completes. Note that layer() will remain valid until the |
// end of ~LayerOwner(). |
- scoped_ptr<Layer> AcquireLayer(); |
+ std::unique_ptr<Layer> AcquireLayer(); |
// Asks the owner to recreate the layer, returning the old Layer. NULL is |
// returned if there is no existing layer, or recreate is not supported. |
// |
// This does not recurse. Existing children of the layer are moved to the new |
// layer. |
- virtual scoped_ptr<Layer> RecreateLayer(); |
+ virtual std::unique_ptr<Layer> RecreateLayer(); |
ui::Layer* layer() { return layer_; } |
const ui::Layer* layer() const { return layer_; } |
@@ -54,7 +55,7 @@ class COMPOSITOR_EXPORT LayerOwner { |
// |layer_owner_| will be NULL. The reason for releasing ownership is that |
// the client may wish to animate the layer beyond the lifetime of the owner, |
// e.g. fading it out when it is destroyed. |
- scoped_ptr<Layer> layer_owner_; |
+ std::unique_ptr<Layer> layer_owner_; |
Layer* layer_; |
LayerOwnerDelegate* layer_owner_delegate_; |