| Index: ui/gfx/icon_util.h
|
| diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h
|
| index 10f46c18945e7d81ee2f11c57281b2ec1ee18ef4..960018ece0fe07839d2b7e801738e21e776a71f0 100644
|
| --- a/ui/gfx/icon_util.h
|
| +++ b/ui/gfx/icon_util.h
|
| @@ -8,11 +8,11 @@
|
| #include <windows.h>
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/win/scoped_gdi_object.h"
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -103,7 +103,7 @@ class GFX_EXPORT IconUtil {
|
| // loaded .dll or .exe |module|. Supports loading smaller icon sizes as well
|
| // as the Vista+ 256x256 PNG icon size. If the icon could not be loaded or
|
| // found, returns a NULL scoped_ptr.
|
| - static scoped_ptr<gfx::ImageFamily> CreateImageFamilyFromIconResource(
|
| + static std::unique_ptr<gfx::ImageFamily> CreateImageFamilyFromIconResource(
|
| HMODULE module,
|
| int resource_id);
|
|
|
|
|