| Index: chrome/browser/supervised_user/supervised_user_service.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
|
| index 23dd47cd03e6db8aba89cdec83d06d27f8d9dee7..acd40cd8aa539f62ec8e3ffe35da22b7c8ed90a7 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_service.cc
|
| @@ -219,9 +219,10 @@ void SupervisedUserService::GetCategoryNames(CategoryList* list) {
|
|
|
| std::string SupervisedUserService::GetCustodianEmailAddress() const {
|
| #if defined(OS_CHROMEOS)
|
| - return chromeos::UserManager::Get()->GetSupervisedUserManager()->
|
| - GetManagerDisplayEmail(
|
| - chromeos::UserManager::Get()->GetActiveUser()->email());
|
| + return chromeos::GetUserManager()
|
| + ->GetSupervisedUserManager()
|
| + ->GetManagerDisplayEmail(
|
| + chromeos::GetUserManager()->GetActiveUser()->email());
|
| #else
|
| return profile_->GetPrefs()->GetString(prefs::kSupervisedUserCustodianEmail);
|
| #endif
|
| @@ -229,9 +230,11 @@ std::string SupervisedUserService::GetCustodianEmailAddress() const {
|
|
|
| std::string SupervisedUserService::GetCustodianName() const {
|
| #if defined(OS_CHROMEOS)
|
| - return base::UTF16ToUTF8(chromeos::UserManager::Get()->
|
| - GetSupervisedUserManager()->GetManagerDisplayName(
|
| - chromeos::UserManager::Get()->GetActiveUser()->email()));
|
| + return base::UTF16ToUTF8(
|
| + chromeos::GetUserManager()
|
| + ->GetSupervisedUserManager()
|
| + ->GetManagerDisplayName(
|
| + chromeos::GetUserManager()->GetActiveUser()->email()));
|
| #else
|
| std::string name = profile_->GetPrefs()->GetString(
|
| prefs::kSupervisedUserCustodianName);
|
|
|