| Index: cc/layers/heads_up_display_layer.h
|
| diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h
|
| index 5d416c26866844fe349c60003a6a5b918e2ef188..60d8f53d750544eb5f1a500a20b4de5dafe76bee 100644
|
| --- a/cc/layers/heads_up_display_layer.h
|
| +++ b/cc/layers/heads_up_display_layer.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_H_
|
| #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/layers/layer.h"
|
| #include "third_party/skia/include/core/SkTypeface.h"
|
| @@ -26,7 +26,7 @@ class CC_EXPORT HeadsUpDisplayLayer : public Layer {
|
| void PrepareForCalculateDrawProperties(
|
| const gfx::Size& device_viewport, float device_scale_factor);
|
|
|
| - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
|
|
| void SetTypeForProtoSerialization(proto::LayerNode* proto) const override;
|
|
|
|
|