chrome/browser/ui/webui/options/supervised_user_import_handler.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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: chrome/browser/ui/webui/options/supervised_user_import_handler.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/ui/webui/options/supervised_user_import_handler.h ('k') | chrome/browser/ui/webui/options/sync_setup_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/supervised_user_import_handler.cc

diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc

index 4c81acc0a69d6a15b07d3c7c0f52243e286c925c..7bf7fd957af80e871c1c044cf84113c035211b88 100644

--- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc

+++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc

@@ -34,8 +34,8 @@

namespace {

-scoped_ptr<base::ListValue> GetAvatarIcons() {

- scoped_ptr<base::ListValue> avatar_icons(new base::ListValue);

+std::unique_ptr<base::ListValue> GetAvatarIcons() {

+ std::unique_ptr<base::ListValue> avatar_icons(new base::ListValue);

for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {

std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i);

avatar_icons->Append(new base::StringValue(avatar_url));