Chromium Code Reviews| Index: components/user_manager/user_manager_base.cc |
| diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc |
| index abd329c43327cf3e21c76f98af9de767c9d827e8..c0ca0e01da21fcf2a925126be719bebfeb54fc0e 100644 |
| --- a/components/user_manager/user_manager_base.cc |
| +++ b/components/user_manager/user_manager_base.cc |
| @@ -657,10 +657,6 @@ void UserManagerBase::NotifyLocalStateChanged() { |
| UserManager::Observer, observer_list_, LocalStateChanged(this)); |
| } |
| -void UserManagerBase::ForceUpdateState() { |
| - UpdateLoginState(); |
| -} |
| - |
| bool UserManagerBase::CanUserBeRemoved(const User* user) const { |
| // Only regular and supervised users are allowed to be manually removed. |
| if (!user || (user->GetType() != USER_TYPE_REGULAR && |
| @@ -958,6 +954,15 @@ void UserManagerBase::NotifyActiveUserHashChanged(const std::string& hash) { |
| ActiveUserHashChanged(hash)); |
| } |
| +void UserManagerBase::ChangeUserSupervisedStatus( |
| + User* user, bool is_supervised) { |
|
Daniel Erat
2014/10/07 16:19:19
nit: one argument per line since they don't all fi
merkulova
2014/10/08 09:47:11
Done.
|
| + DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
| + user->SetIsSupervised(is_supervised); |
| + FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver, |
| + session_state_observer_list_, |
| + UserChangedSupervisedStatus(user)); |
| +} |
| + |
| void UserManagerBase::UpdateLoginState() { |
| if (!chromeos::LoginState::IsInitialized()) |
| return; // LoginState may not be intialized in tests. |