| Index: ui/native_theme/native_theme_base.cc
|
| diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
|
| index d0f135ac75032e1af109f27e299b0aed2e579dc0..cc94eafb7b432d0af3abfcb0c9dcabb5b9cde16b 100644
|
| --- a/ui/native_theme/native_theme_base.cc
|
| +++ b/ui/native_theme/native_theme_base.cc
|
| @@ -5,10 +5,10 @@
|
| #include "ui/native_theme/native_theme_base.h"
|
|
|
| #include <limits>
|
| +#include <memory>
|
|
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| #include "third_party/skia/include/core/SkPath.h"
|
| #include "third_party/skia/include/effects/SkGradientShader.h"
|
| @@ -922,7 +922,7 @@ void NativeThemeBase::DrawImageInt(
|
| SkCanvas* sk_canvas, const gfx::ImageSkia& image,
|
| int src_x, int src_y, int src_w, int src_h,
|
| int dest_x, int dest_y, int dest_w, int dest_h) const {
|
| - scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
|
| + std::unique_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
|
| canvas->DrawImageInt(image, src_x, src_y, src_w, src_h,
|
| dest_x, dest_y, dest_w, dest_h, true);
|
| }
|
| @@ -931,7 +931,7 @@ void NativeThemeBase::DrawTiledImage(SkCanvas* sk_canvas,
|
| const gfx::ImageSkia& image,
|
| int src_x, int src_y, float tile_scale_x, float tile_scale_y,
|
| int dest_x, int dest_y, int w, int h) const {
|
| - scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
|
| + std::unique_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas));
|
| canvas->TileImageInt(image, src_x, src_y, tile_scale_x,
|
| tile_scale_y, dest_x, dest_y, w, h);
|
| }
|
|
|