Index: ui/views/controls/button/image_button.h |
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h |
index 71311fe08f432fbb4bbd188e2a233fb941311d67..014998c02a1a72aac736bf2c23b83f616c9e8df9 100644 |
--- a/ui/views/controls/button/image_button.h |
+++ b/ui/views/controls/button/image_button.h |
@@ -5,9 +5,10 @@ |
#ifndef UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ |
#define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ |
+#include <memory> |
+ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/base/layout.h" |
#include "ui/gfx/image/image_skia.h" |
#include "ui/views/controls/button/custom_button.h" |
@@ -56,7 +57,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton { |
void SetImageAlignment(HorizontalAlignment h_align, |
VerticalAlignment v_align); |
- void SetFocusPainter(scoped_ptr<Painter> focus_painter); |
+ void SetFocusPainter(std::unique_ptr<Painter> focus_painter); |
// The minimum size of the contents (not including the border). The contents |
// will be at least this size, but may be larger if the image itself is |
@@ -113,7 +114,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton { |
// resources. |
bool draw_image_mirrored_; |
- scoped_ptr<Painter> focus_painter_; |
+ std::unique_ptr<Painter> focus_painter_; |
DISALLOW_COPY_AND_ASSIGN(ImageButton); |
}; |