Added calls for deferred supervised user status change.

components/user_manager/user_manager_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 639 matching lines @@
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   session_state_observer_list_.RemoveObserver(obs);
 }
 
 void UserManagerBase::NotifyLocalStateChanged() {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   FOR_EACH_OBSERVER(
       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 &&
                 user->GetType() != USER_TYPE_SUPERVISED)) {
     return false;
   }
 
   // Sanity check: we must not remove single user unless it's an enterprise
   // device. This check may seem redundant at a first sight because
   // this single user must be an owner and we perform special check later
@@ skipping 277 matching lines @@
                     UserAddedToSession(added_user));
 }
 
 void UserManagerBase::NotifyActiveUserHashChanged(const std::string& hash) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
                     session_state_observer_list_,
                     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 fit on the same line as the
signature

[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.
 
   chromeos::LoginState::LoggedInState logged_in_state;
   logged_in_state = active_user_ ? chromeos::LoginState::LOGGED_IN_ACTIVE
                                  : chromeos::LoginState::LOGGED_IN_NONE;
 
   chromeos::LoginState::LoggedInUserType login_user_type;
   if (logged_in_state == chromeos::LoginState::LOGGED_IN_NONE)
@@ skipping 83 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace user_manager