| Index: cc/layers/nine_patch_layer.h
|
| diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h
|
| index 20b5e4934149f3fffc1343ca15626e49cf75c6bd..1c2d7259e3e5b33e0f1cac97d13bc1839723b47e 100644
|
| --- a/cc/layers/nine_patch_layer.h
|
| +++ b/cc/layers/nine_patch_layer.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_LAYERS_NINE_PATCH_LAYER_H_
|
| #define CC_LAYERS_NINE_PATCH_LAYER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/ui_resource_layer.h"
|
| @@ -44,7 +45,7 @@ class CC_EXPORT NinePatchLayer : public UIResourceLayer {
|
| private:
|
| NinePatchLayer();
|
| ~NinePatchLayer() override;
|
| - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
|
|
| gfx::Rect border_;
|
| bool fill_center_;
|
|
|