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/supervised_user/supervised_user_service.h" | 5 #include "chrome/browser/supervised_user/supervised_user_service.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 registry->RegisterStringPref( | 178 registry->RegisterStringPref( |
179 prefs::kSupervisedUserCustodianEmail, std::string(), | 179 prefs::kSupervisedUserCustodianEmail, std::string(), |
180 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 180 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
181 registry->RegisterStringPref( | 181 registry->RegisterStringPref( |
182 prefs::kSupervisedUserCustodianName, std::string(), | 182 prefs::kSupervisedUserCustodianName, std::string(), |
183 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 183 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
184 registry->RegisterStringPref( | 184 registry->RegisterStringPref( |
185 prefs::kSupervisedUserCustodianProfileImageURL, std::string(), | 185 prefs::kSupervisedUserCustodianProfileImageURL, std::string(), |
186 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 186 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
187 registry->RegisterStringPref( | 187 registry->RegisterStringPref( |
| 188 prefs::kSupervisedUserCustodianProfileURL, std::string(), |
| 189 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 190 registry->RegisterStringPref( |
188 prefs::kSupervisedUserSecondCustodianEmail, std::string(), | 191 prefs::kSupervisedUserSecondCustodianEmail, std::string(), |
189 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 192 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
190 registry->RegisterStringPref( | 193 registry->RegisterStringPref( |
191 prefs::kSupervisedUserSecondCustodianName, std::string(), | 194 prefs::kSupervisedUserSecondCustodianName, std::string(), |
192 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 195 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
193 registry->RegisterStringPref( | 196 registry->RegisterStringPref( |
194 prefs::kSupervisedUserSecondCustodianProfileImageURL, std::string(), | 197 prefs::kSupervisedUserSecondCustodianProfileImageURL, std::string(), |
195 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 198 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 199 registry->RegisterStringPref( |
| 200 prefs::kSupervisedUserSecondCustodianProfileURL, std::string(), |
| 201 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
196 registry->RegisterBooleanPref(prefs::kSupervisedUserCreationAllowed, true, | 202 registry->RegisterBooleanPref(prefs::kSupervisedUserCreationAllowed, true, |
197 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 203 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
198 } | 204 } |
199 | 205 |
200 void SupervisedUserService::SetDelegate(Delegate* delegate) { | 206 void SupervisedUserService::SetDelegate(Delegate* delegate) { |
201 if (delegate_ == delegate) | 207 if (delegate_ == delegate) |
202 return; | 208 return; |
203 // If the delegate changed, deactivate first to give the old delegate a chance | 209 // If the delegate changed, deactivate first to give the old delegate a chance |
204 // to clean up. | 210 // to clean up. |
205 SetActive(false); | 211 SetActive(false); |
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 // The active user can be NULL in unit tests. | 788 // The active user can be NULL in unit tests. |
783 if (chromeos::UserManager::Get()->GetActiveUser()) { | 789 if (chromeos::UserManager::Get()->GetActiveUser()) { |
784 return UTF16ToUTF8(chromeos::UserManager::Get()->GetUserDisplayName( | 790 return UTF16ToUTF8(chromeos::UserManager::Get()->GetUserDisplayName( |
785 chromeos::UserManager::Get()->GetActiveUser()->GetUserID())); | 791 chromeos::UserManager::Get()->GetActiveUser()->GetUserID())); |
786 } | 792 } |
787 return std::string(); | 793 return std::string(); |
788 #else | 794 #else |
789 return profile_->GetPrefs()->GetString(prefs::kProfileName); | 795 return profile_->GetPrefs()->GetString(prefs::kProfileName); |
790 #endif | 796 #endif |
791 } | 797 } |
OLD | NEW |