| Index: chrome/browser/chromeos/login/fake_user_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/fake_user_manager.cc b/chrome/browser/chromeos/login/fake_user_manager.cc
|
| index 3b027dc03dc4953bda68c525e951526e1fb2dc34..42a4008df1d2268bd66e51d8c07b9c61cf83951d 100644
|
| --- a/chrome/browser/chromeos/login/fake_user_manager.cc
|
| +++ b/chrome/browser/chromeos/login/fake_user_manager.cc
|
| @@ -28,6 +28,16 @@ void FakeUserManager::AddUser(const std::string& email) {
|
| user_list_.push_back(user);
|
| }
|
|
|
| +void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) {
|
| + User* user = User::CreateKioskAppUser(kiosk_app_username);
|
| + user->set_username_hash(kiosk_app_username + kUserIdHashSuffix);
|
| + user_list_.push_back(user);
|
| +}
|
| +
|
| +void FakeUserManager::UserLoggedIn(const std::string& email) {
|
| + UserLoggedIn(email, email + kUserIdHashSuffix, false);
|
| +}
|
| +
|
| const UserList& FakeUserManager::GetUsers() const {
|
| return user_list_;
|
| }
|
| @@ -61,15 +71,18 @@ void FakeUserManager::UserLoggedIn(const std::string& email,
|
| }
|
| }
|
|
|
| +User* FakeUserManager::GetActiveUserInternal() const {
|
| + if (user_list_.size())
|
| + return user_list_[0];
|
| + return NULL;
|
| +}
|
| +
|
| const User* FakeUserManager::GetActiveUser() const {
|
| - return GetActiveUser();
|
| + return GetActiveUserInternal();
|
| }
|
|
|
| User* FakeUserManager::GetActiveUser() {
|
| - // Just return the first user.
|
| - if (user_list_.size())
|
| - return user_list_[0];
|
| - return NULL;
|
| + return GetActiveUserInternal();
|
| }
|
|
|
| void FakeUserManager::SaveUserDisplayName(
|
| @@ -184,7 +197,7 @@ bool FakeUserManager::CanCurrentUserLock() const {
|
| }
|
|
|
| bool FakeUserManager::IsUserLoggedIn() const {
|
| - return true;
|
| + return logged_in_users_.size() > 0;
|
| }
|
|
|
| bool FakeUserManager::IsLoggedInAsRegularUser() const {
|
| @@ -208,7 +221,10 @@ bool FakeUserManager::IsLoggedInAsLocallyManagedUser() const {
|
| }
|
|
|
| bool FakeUserManager::IsLoggedInAsKioskApp() const {
|
| - return false;
|
| + const User* active_user = GetActiveUser();
|
| + return active_user ?
|
| + active_user->GetType() == User::USER_TYPE_KIOSK_APP :
|
| + false;
|
| }
|
|
|
| bool FakeUserManager::IsLoggedInAsStub() const {
|
|
|