New user type introduced. Combines regular and supervised features.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 105c9c5cb32ccdbbffe6024e3ffc9940de3020c1..d7143d7efe8cc28096937f705092999dfed97008 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -554,8 +554,8 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() {
     return;
 
   // Only regular users could add other users to current session.

[Daniel Erat, 2014/11/11 16:02:49]

please update this comment to describe what the condition is actually testing
now (e.g. "Only regular, non-supervised users ...")

[merkulova, 2014/11/12 10:01:01]

Done.

-  if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
-      user_manager::USER_TYPE_REGULAR) {
+  if (!user_manager::UserManager::Get()->GetActiveUser()->IsRegular() ||

[bartfab (slow), 2014/11/11 19:42:06]

The old code implemented the exactly same condition in a simpler way.

[merkulova, 2014/11/12 10:01:01]

Done.

+       user_manager::UserManager::Get()->GetActiveUser()->IsSupervised()) {

[Daniel Erat, 2014/11/11 16:02:49]

nit: indent this one space less:

  if (!user_manager::... ||
      user_manager::...) {

[merkulova, 2014/11/12 10:01:01]

Done.

     return;
   }