chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_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/chromeos/login/supervised_user_creation_screen_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/chromeos/login/signin_userlist_unittest.cc ('k') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

index 05502d290443fb3947aece338824423691173f78..ffeed71207acb64fc5814f1a025ce869e5c28bec 100644

--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

@@ -218,8 +218,8 @@ void SupervisedUserCreationScreenHandler::RegisterMessages() {

void SupervisedUserCreationScreenHandler::PrepareToShow() {}

void SupervisedUserCreationScreenHandler::Show() {

- scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());

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

+ std::unique_ptr<base::DictionaryValue> data(new base::DictionaryValue());

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

const user_manager::UserList& users =

ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation();

std::string owner;

@@ -408,7 +408,8 @@ void SupervisedUserCreationScreenHandler::HandleGetImages() {

base::ListValue image_urls;

for (int i = default_user_image::kFirstDefaultImageIndex;

i < default_user_image::kDefaultImagesCount; ++i) {

- scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);

+ std::unique_ptr<base::DictionaryValue> image_data(

+ new base::DictionaryValue);

image_data->SetString("url", default_user_image::GetDefaultImageUrl(i));

image_data->SetString("author",

l10n_util::GetStringUTF16(