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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 718673002: New user type introduced. Combines regular and supervised features. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index e487a32e1cc96a3e020edf77cf4172399088e444..0b9c6ea9c584eef1fa96731ac20abca37adac425 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -228,8 +228,7 @@ void ExistingUserController::UpdateLoginDisplay(
(*it)->GetType() != user_manager::USER_TYPE_SUPERVISED ||
user_manager::UserManager::Get()->AreSupervisedUsersAllowed();
bool meets_whitelist_requirements =
- LoginUtils::IsWhitelisted((*it)->email(), NULL) ||
- (*it)->GetType() != user_manager::USER_TYPE_REGULAR;
+ LoginUtils::IsWhitelisted((*it)->email(), NULL) || (*it)->IsRegular();
Nikita (slow) 2014/11/11 12:06:36 This has to be !(*it)->IsRegular()
merkulova 2014/11/11 15:47:43 Done.
// Public session accounts are always shown on login screen.
bool meets_show_users_requirements =
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698