ui/gfx/render_text_mac.mm - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/render_text_mac.mm

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

Index: ui/gfx/render_text_mac.mm

diff --git a/ui/gfx/render_text_mac.mm b/ui/gfx/render_text_mac.mm

index 44fb17d39f15fb4e0fc7bd86ae2303d6d70da354..f1c7299af209198be595064a33796efe5d70d5ee 100644

--- a/ui/gfx/render_text_mac.mm

+++ b/ui/gfx/render_text_mac.mm

@@ -16,6 +16,7 @@

#include "base/mac/mac_util.h"

#include "base/mac/scoped_cftyperef.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/strings/sys_string_conversions.h"

#include "skia/ext/skia_utils_mac.h"

#include "third_party/skia/include/ports/SkTypeface_mac.h"

@@ -79,8 +80,8 @@ RenderTextMac::RenderTextMac() : common_baseline_(0), runs_valid_(false) {}

RenderTextMac::~RenderTextMac() {}

-scoped_ptr<RenderText> RenderTextMac::CreateInstanceOfSameType() const {

- return make_scoped_ptr(new RenderTextMac);

+std::unique_ptr<RenderText> RenderTextMac::CreateInstanceOfSameType() const {

+ return base::WrapUnique(new RenderTextMac);

}

bool RenderTextMac::MultilineSupported() const {

« no previous file with comments | « ui/gfx/render_text_mac.h ('k') | ui/gfx/render_text_unittest.cc » ('j') | no next file with comments »