| Index: cc/layers/nine_patch_layer_impl.h
|
| diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
|
| index 539d8e717aed319b6c88bfc6c1e73f727b3a9308..1fe8e7f2a39eef00adcde12f0c688b94f23185d5 100644
|
| --- a/cc/layers/nine_patch_layer_impl.h
|
| +++ b/cc/layers/nine_patch_layer_impl.h
|
| @@ -8,6 +8,7 @@
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer_impl.h"
|
| #include "cc/layers/ui_resource_layer_impl.h"
|
| @@ -24,9 +25,9 @@ namespace cc {
|
|
|
| class CC_EXPORT NinePatchLayerImpl : public UIResourceLayerImpl {
|
| public:
|
| - static scoped_ptr<NinePatchLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| - int id) {
|
| - return make_scoped_ptr(new NinePatchLayerImpl(tree_impl, id));
|
| + static std::unique_ptr<NinePatchLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| + int id) {
|
| + return base::WrapUnique(new NinePatchLayerImpl(tree_impl, id));
|
| }
|
| ~NinePatchLayerImpl() override;
|
|
|
| @@ -59,7 +60,7 @@ class CC_EXPORT NinePatchLayerImpl : public UIResourceLayerImpl {
|
| bool fill_center,
|
| bool nearest_neighbor);
|
|
|
| - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| void AppendQuads(RenderPass* render_pass,
|
|
|