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

Unified Diff: ui/views/controls/label.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/image_view.cc ('k') | ui/views/controls/label.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.h
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index b2520e3d87647201b54097c1bd260eb8e36dcb8d..6dd1800584fa9ad6551de2ca048617cc06adea7f 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -137,7 +137,7 @@ class VIEWS_EXPORT Label : public View {
protected:
// Create a single RenderText instance to actually be painted.
- virtual scoped_ptr<gfx::RenderText> CreateRenderText(
+ virtual std::unique_ptr<gfx::RenderText> CreateRenderText(
const base::string16& text,
gfx::HorizontalAlignment alignment,
gfx::DirectionalityMode directionality,
@@ -184,10 +184,10 @@ class VIEWS_EXPORT Label : public View {
bool ShouldShowDefaultTooltip() const;
// An un-elided and single-line RenderText object used for preferred sizing.
- scoped_ptr<gfx::RenderText> render_text_;
+ std::unique_ptr<gfx::RenderText> render_text_;
// The RenderText instances used to display elided and multi-line text.
- std::vector<scoped_ptr<gfx::RenderText>> lines_;
+ std::vector<std::unique_ptr<gfx::RenderText>> lines_;
SkColor requested_enabled_color_;
SkColor actual_enabled_color_;
« no previous file with comments | « ui/views/controls/image_view.cc ('k') | ui/views/controls/label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698