| Index: ui/views/controls/image_view.h
|
| diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
|
| index b3b762bcd432cf81435916397445636d8b738b94..eb3f727ead75ad8aeb9d19bd75846706057ead86 100644
|
| --- a/ui/views/controls/image_view.h
|
| +++ b/ui/views/controls/image_view.h
|
| @@ -77,7 +77,7 @@ class VIEWS_EXPORT ImageView : public View {
|
|
|
| void set_interactive(bool interactive) { interactive_ = interactive; }
|
|
|
| - void SetFocusPainter(scoped_ptr<Painter> focus_painter);
|
| + void SetFocusPainter(std::unique_ptr<Painter> focus_painter);
|
|
|
| // Overriden from View:
|
| gfx::Size GetPreferredSize() const override;
|
| @@ -133,7 +133,7 @@ class VIEWS_EXPORT ImageView : public View {
|
| // safe to cache.
|
| void* last_painted_bitmap_pixels_;
|
|
|
| - scoped_ptr<views::Painter> focus_painter_;
|
| + std::unique_ptr<views::Painter> focus_painter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ImageView);
|
| };
|
|
|