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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
6 6
7 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 10 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 AddCallback("supervisedUserSelectImage", 211 AddCallback("supervisedUserSelectImage",
212 &SupervisedUserCreationScreenHandler::HandleSelectImage); 212 &SupervisedUserCreationScreenHandler::HandleSelectImage);
213 AddCallback("currentSupervisedUserPage", 213 AddCallback("currentSupervisedUserPage",
214 &SupervisedUserCreationScreenHandler:: 214 &SupervisedUserCreationScreenHandler::
215 HandleCurrentSupervisedUserPage); 215 HandleCurrentSupervisedUserPage);
216 } 216 }
217 217
218 void SupervisedUserCreationScreenHandler::PrepareToShow() {} 218 void SupervisedUserCreationScreenHandler::PrepareToShow() {}
219 219
220 void SupervisedUserCreationScreenHandler::Show() { 220 void SupervisedUserCreationScreenHandler::Show() {
221 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); 221 std::unique_ptr<base::DictionaryValue> data(new base::DictionaryValue());
222 scoped_ptr<base::ListValue> users_list(new base::ListValue()); 222 std::unique_ptr<base::ListValue> users_list(new base::ListValue());
223 const user_manager::UserList& users = 223 const user_manager::UserList& users =
224 ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation(); 224 ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation();
225 std::string owner; 225 std::string owner;
226 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); 226 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
227 227
228 for (user_manager::UserList::const_iterator it = users.begin(); 228 for (user_manager::UserList::const_iterator it = users.begin();
229 it != users.end(); 229 it != users.end();
230 ++it) { 230 ++it) {
231 bool is_owner = ((*it)->email() == owner); 231 bool is_owner = ((*it)->email() == owner);
232 base::DictionaryValue* user_dict = new base::DictionaryValue(); 232 base::DictionaryValue* user_dict = new base::DictionaryValue();
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 manager_raw_account_id.GetGaiaId()); 401 manager_raw_account_id.GetGaiaId());
402 delegate_->AuthenticateManager(manager_account_id, manager_password); 402 delegate_->AuthenticateManager(manager_account_id, manager_password);
403 } 403 }
404 404
405 // TODO(antrim) : this is an explicit code duplications with UserImageScreen. 405 // TODO(antrim) : this is an explicit code duplications with UserImageScreen.
406 // It should be removed by issue 251179. 406 // It should be removed by issue 251179.
407 void SupervisedUserCreationScreenHandler::HandleGetImages() { 407 void SupervisedUserCreationScreenHandler::HandleGetImages() {
408 base::ListValue image_urls; 408 base::ListValue image_urls;
409 for (int i = default_user_image::kFirstDefaultImageIndex; 409 for (int i = default_user_image::kFirstDefaultImageIndex;
410 i < default_user_image::kDefaultImagesCount; ++i) { 410 i < default_user_image::kDefaultImagesCount; ++i) {
411 scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue); 411 std::unique_ptr<base::DictionaryValue> image_data(
412 new base::DictionaryValue);
412 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i)); 413 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i));
413 image_data->SetString("author", 414 image_data->SetString("author",
414 l10n_util::GetStringUTF16( 415 l10n_util::GetStringUTF16(
415 default_user_image::kDefaultImageAuthorIDs[i])); 416 default_user_image::kDefaultImageAuthorIDs[i]));
416 image_data->SetString("website", 417 image_data->SetString("website",
417 l10n_util::GetStringUTF16( 418 l10n_util::GetStringUTF16(
418 default_user_image::kDefaultImageWebsiteIDs[i])); 419 default_user_image::kDefaultImageWebsiteIDs[i]));
419 image_data->SetString("title", 420 image_data->SetString("title",
420 default_user_image::GetDefaultImageDescription(i)); 421 default_user_image::GetDefaultImageDescription(i));
421 image_urls.Append(image_data.release()); 422 image_urls.Append(image_data.release());
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { 464 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) {
464 CallJS("setCameraPresent", present); 465 CallJS("setCameraPresent", present);
465 } 466 }
466 467
467 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( 468 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers(
468 const base::ListValue* users) { 469 const base::ListValue* users) {
469 CallJS("setExistingSupervisedUsers", *users); 470 CallJS("setExistingSupervisedUsers", *users);
470 } 471 }
471 472
472 } // namespace chromeos 473 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698