New user type introduced. Combines regular and supervised features.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 536 matching lines @@
                              GURL(chrome::kLearnMoreEnterpriseURL));
   }
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   ash::Shell* shell = ash::Shell::GetInstance();
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return;
 
   // Only regular users could add other users to current session.
-  if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
-      user_manager::USER_TYPE_REGULAR) {
+  if (!user_manager::UserManager::Get()->GetActiveUser()->IsRegular())

[Nikita (slow), 2014/11/11 12:06:36]

IsRegular() && !IsSupervised()

Might as well add helper function: IsRegularNotSupervised()

[merkulova, 2014/11/11 15:47:43]

As far as we need it once for now, leaving it as combo.

     return;
-  }
 
   if (static_cast<int>(
           user_manager::UserManager::Get()->GetLoggedInUsers().size()) >=
       shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers())
     return;
 
   // Launch sign in screen to add another user to current session.
   if (user_manager::UserManager::Get()
           ->GetUsersAllowedForMultiProfile()
           .size()) {
@@ skipping 740 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos