| Index: ui/base/nine_image_painter_factory.h
|
| diff --git a/ui/base/nine_image_painter_factory.h b/ui/base/nine_image_painter_factory.h
|
| index 5978c0f113433c41ef4dbfb7e6342452ece558b3..af4b13c3dbb419984e2d69f81be2215c0f725b5e 100644
|
| --- a/ui/base/nine_image_painter_factory.h
|
| +++ b/ui/base/nine_image_painter_factory.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef UI_BASE_NINE_IMAGE_PAINTER_FACTORY_H_
|
| #define UI_BASE_NINE_IMAGE_PAINTER_FACTORY_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "ui/base/ui_base_export.h"
|
|
|
| // A macro to define arrays of IDR constants used with CreateImageGridPainter.
|
| @@ -43,7 +44,7 @@ namespace ui {
|
|
|
| // Creates a NineImagePainter from an array of image ids. It's expected the
|
| // array came from the IMAGE_GRID macro.
|
| -UI_BASE_EXPORT scoped_ptr<gfx::NineImagePainter> CreateNineImagePainter(
|
| +UI_BASE_EXPORT std::unique_ptr<gfx::NineImagePainter> CreateNineImagePainter(
|
| const int image_ids[]);
|
|
|
| } // namespace ui
|
|
|