OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 12 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
12 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" | 13 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" |
13 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" | 14 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" |
14 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 15 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
15 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 16 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
17 #include "chrome/browser/chromeos/settings/cros_settings.h" | 18 #include "chrome/browser/chromeos/settings/cros_settings.h" |
18 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" | 19 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 std::unique_ptr<base::ListValue> users_list(new base::ListValue()); | 226 std::unique_ptr<base::ListValue> users_list(new base::ListValue()); |
226 const user_manager::UserList& users = | 227 const user_manager::UserList& users = |
227 ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation(); | 228 ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation(); |
228 std::string owner; | 229 std::string owner; |
229 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); | 230 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); |
230 | 231 |
231 for (user_manager::UserList::const_iterator it = users.begin(); | 232 for (user_manager::UserList::const_iterator it = users.begin(); |
232 it != users.end(); | 233 it != users.end(); |
233 ++it) { | 234 ++it) { |
234 bool is_owner = ((*it)->email() == owner); | 235 bool is_owner = ((*it)->email() == owner); |
235 base::DictionaryValue* user_dict = new base::DictionaryValue(); | 236 auto user_dict = base::MakeUnique<base::DictionaryValue>(); |
236 UserSelectionScreen::FillUserDictionary( | 237 UserSelectionScreen::FillUserDictionary( |
237 *it, is_owner, false, /* is_signin_to_add */ | 238 *it, is_owner, false, /* is_signin_to_add */ |
238 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, | 239 proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, |
239 NULL, /* public_session_recommended_locales */ | 240 NULL, /* public_session_recommended_locales */ |
240 user_dict); | 241 user_dict.get()); |
241 users_list->Append(user_dict); | 242 users_list->Append(std::move(user_dict)); |
242 } | 243 } |
243 data->Set("managers", users_list.release()); | 244 data->Set("managers", users_list.release()); |
244 ShowScreenWithData(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW, | 245 ShowScreenWithData(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW, |
245 data.get()); | 246 data.get()); |
246 | 247 |
247 if (!delegate_) | 248 if (!delegate_) |
248 return; | 249 return; |
249 } | 250 } |
250 | 251 |
251 void SupervisedUserCreationScreenHandler::Hide() { | 252 void SupervisedUserCreationScreenHandler::Hide() { |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { | 470 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { |
470 CallJS("setCameraPresent", present); | 471 CallJS("setCameraPresent", present); |
471 } | 472 } |
472 | 473 |
473 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( | 474 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( |
474 const base::ListValue* users) { | 475 const base::ListValue* users) { |
475 CallJS("setExistingSupervisedUsers", *users); | 476 CallJS("setExistingSupervisedUsers", *users); |
476 } | 477 } |
477 | 478 |
478 } // namespace chromeos | 479 } // namespace chromeos |
OLD | NEW |