Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4944)

Unified Diff: chrome/browser/chromeos/login/fake_user_manager.cc

Issue 23604068: Add "kiosk_only" manifest attribute for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed .crx binary Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b0a139bd7beb8bdeb26d9c58489aafab16a7be6f..007ce1a7940e993cd25f322b496f686d588e5e9b 100644
--- a/chrome/browser/chromeos/login/fake_user_manager.cc
+++ b/chrome/browser/chromeos/login/fake_user_manager.cc
@@ -30,6 +30,12 @@ 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::LoginUser(const std::string& email) {
UserLoggedIn(email, email + kUserIdHashSuffix, false);
}
@@ -70,15 +76,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(
@@ -198,7 +207,7 @@ bool FakeUserManager::CanCurrentUserLock() const {
}
bool FakeUserManager::IsUserLoggedIn() const {
- return true;
+ return logged_in_users_.size() > 0;
}
bool FakeUserManager::IsLoggedInAsRegularUser() const {
@@ -222,7 +231,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 {
« no previous file with comments | « chrome/browser/chromeos/login/fake_user_manager.h ('k') | chrome/browser/extensions/api/system_display/system_display_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698