New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 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/chromeos/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 210 matching lines @@
   cros_settings_->GetBoolean(kAccountsPrefShowUserNamesOnSignIn,
                              &show_users_on_signin);
   for (user_manager::UserList::const_iterator it = users.begin();
        it != users.end();
        ++it) {
     // TODO(xiyuan): Clean user profile whose email is not in whitelist.
     bool meets_supervised_requirements =
         (*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 =
         show_users_on_signin ||
         (*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
     if (meets_supervised_requirements &&
         meets_whitelist_requirements &&
         meets_show_users_requirements) {
       filtered_users.push_back(*it);
     }
@@ skipping 947 matching lines @@
   is_login_in_progress_ = false;
 
   // Reenable clicking on other windows and status area.
   login_display_->SetUIEnabled(true);
 
   if (start_public_session_timer)
     StartPublicSessionAutoLoginTimer();
 }
 
 }  // namespace chromeos