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

Unified Diff: chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc

Issue 2832903002: cros: Remove supervised user methods from SystemTrayDelegate (Closed)
Patch Set: rebase Created 3 years, 8 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/users/fake_chrome_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
index d731dd1a21e3d6394a08c77cbc570b51b6b0f0fd..3e220e4c95394ef71ff587b7e5b13cb351051e4b 100644
--- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -103,6 +103,16 @@ user_manager::User* FakeChromeUserManager::AddArcKioskAppUser(
return user;
}
+user_manager::User* FakeChromeUserManager::AddSupervisedUser(
+ const AccountId& account_id) {
+ user_manager::User* user =
+ user_manager::User::CreateSupervisedUser(account_id);
+ user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
+ account_id.GetUserEmail()));
+ users_.push_back(user);
+ return user;
+}
+
const user_manager::User* FakeChromeUserManager::AddPublicAccountUser(
const AccountId& account_id) {
user_manager::User* user =
@@ -126,6 +136,14 @@ void FakeChromeUserManager::LoginUser(const AccountId& account_id) {
UserLoggedIn(account_id, ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()),
false /* browser_restart */);
+
+ // NOTE: This does not match production. See function comment.
+ for (auto* user : users_) {
+ if (user->GetAccountId() == account_id) {
+ user->set_profile_is_created();
+ break;
+ }
+ }
}
BootstrapManager* FakeChromeUserManager::GetBootstrapManager() {
@@ -370,7 +388,6 @@ void FakeChromeUserManager::UserLoggedIn(const AccountId& account_id,
for (auto* user : users_) {
if (user->username_hash() == username_hash) {
user->set_is_logged_in(true);
- user->set_profile_is_created();
logged_in_users_.push_back(user);
if (!primary_user_)
@@ -378,6 +395,7 @@ void FakeChromeUserManager::UserLoggedIn(const AccountId& account_id,
break;
}
}
+ // TODO(jamescook): This should set active_user_ and call NotifyOnLogin().
}
void FakeChromeUserManager::SwitchToLastActiveUser() {
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.h ('k') | chrome/browser/ui/ash/session_controller_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698