| Index: chrome/browser/chromeos/login/users/fake_user_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/chrome/browser/chromeos/login/users/fake_user_manager.cc
|
| index f3427b39e79b2b45c1a3f3eda65bbd49e9fade42..1efbace9b019bfaf5eeac4c9c8893ae1ab35fb5e 100644
|
| --- a/chrome/browser/chromeos/login/users/fake_user_manager.cc
|
| +++ b/chrome/browser/chromeos/login/users/fake_user_manager.cc
|
| @@ -77,6 +77,8 @@ void FakeUserManager::UserLoggedIn(const std::string& email,
|
| if ((*it)->username_hash() == username_hash) {
|
| (*it)->set_is_logged_in(true);
|
| logged_in_users_.push_back(*it);
|
| + (*it)->set_is_active(true);
|
| + active_user_id_ = (*it)->email();
|
|
|
| if (!primary_user_)
|
| primary_user_ = *it;
|
| @@ -109,6 +111,13 @@ User* FakeUserManager::GetActiveUser() {
|
|
|
| void FakeUserManager::SwitchActiveUser(const std::string& email) {
|
| active_user_id_ = email;
|
| + if (user_list_.size() && !active_user_id_.empty()) {
|
| + for (UserList::const_iterator it = user_list_.begin();
|
| + it != user_list_.end(); ++it) {
|
| + if ((*it)->email() == active_user_id_)
|
| + (*it)->set_is_active(true);
|
| + }
|
| + }
|
| }
|
|
|
| void FakeUserManager::SaveUserDisplayName(
|
|
|