Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: ui/views/controls/image_view.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ui/views/controls/combobox/combobox_unittest.cc ('k') | ui/views/controls/image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698