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 "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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 AddCallback("currentSupervisedUserPage", | 202 AddCallback("currentSupervisedUserPage", |
203 &SupervisedUserCreationScreenHandler:: | 203 &SupervisedUserCreationScreenHandler:: |
204 HandleCurrentSupervisedUserPage); | 204 HandleCurrentSupervisedUserPage); |
205 } | 205 } |
206 | 206 |
207 void SupervisedUserCreationScreenHandler::PrepareToShow() {} | 207 void SupervisedUserCreationScreenHandler::PrepareToShow() {} |
208 | 208 |
209 void SupervisedUserCreationScreenHandler::Show() { | 209 void SupervisedUserCreationScreenHandler::Show() { |
210 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); | 210 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); |
211 scoped_ptr<base::ListValue> users_list(new base::ListValue()); | 211 scoped_ptr<base::ListValue> users_list(new base::ListValue()); |
212 const UserList& users = UserManager::Get()->GetUsers(); | 212 const user_manager::UserList& users = UserManager::Get()->GetUsers(); |
213 std::string owner; | 213 std::string owner; |
214 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); | 214 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner); |
215 | 215 |
216 for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) { | 216 for (user_manager::UserList::const_iterator it = users.begin(); |
| 217 it != users.end(); |
| 218 ++it) { |
217 if ((*it)->GetType() != user_manager::USER_TYPE_REGULAR) | 219 if ((*it)->GetType() != user_manager::USER_TYPE_REGULAR) |
218 continue; | 220 continue; |
219 bool is_owner = ((*it)->email() == owner); | 221 bool is_owner = ((*it)->email() == owner); |
220 base::DictionaryValue* user_dict = new base::DictionaryValue(); | 222 base::DictionaryValue* user_dict = new base::DictionaryValue(); |
221 UserSelectionScreen::FillUserDictionary( | 223 UserSelectionScreen::FillUserDictionary( |
222 *it, | 224 *it, |
223 is_owner, | 225 is_owner, |
224 false /* is_signin_to_add */, | 226 false /* is_signin_to_add */, |
225 ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, | 227 ScreenlockBridge::LockHandler::OFFLINE_PASSWORD, |
226 user_dict); | 228 user_dict); |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { | 449 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) { |
448 CallJS("setCameraPresent", present); | 450 CallJS("setCameraPresent", present); |
449 } | 451 } |
450 | 452 |
451 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( | 453 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers( |
452 const base::ListValue* users) { | 454 const base::ListValue* users) { |
453 CallJS("setExistingManagedUsers", *users); | 455 CallJS("setExistingManagedUsers", *users); |
454 } | 456 } |
455 | 457 |
456 } // namespace chromeos | 458 } // namespace chromeos |
OLD | NEW |