kiosk: Fix kiosk session restart

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 <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 210 matching lines @@
   ConfigurePublicSessionAutoLogin();
 }
 
 void ExistingUserController::UpdateLoginDisplay(
     const user_manager::UserList& users) {
   bool show_users_on_signin;
   user_manager::UserList filtered_users;
 
   cros_settings_->GetBoolean(kAccountsPrefShowUserNamesOnSignIn,
                              &show_users_on_signin);
-  for (user_manager::UserList::const_iterator it = users.begin();
-       it != users.end();
-       ++it) {
+  for (const auto& user : users) {
+    // Skip kiosk apps for login screen user list. Kiosk apps as pods (aka new
+    // kiosk UI) is currently disabled and it gets the apps directly from
+    // KioskAppManager.
+    if (user->GetType() == user_manager::USER_TYPE_KIOSK_APP)
+      continue;
+
     // TODO(xiyuan): Clean user profile whose email is not in whitelist.
-    bool meets_supervised_requirements =
-        (*it)->GetType() != user_manager::USER_TYPE_SUPERVISED ||
+    const bool meets_supervised_requirements =
+        user->GetType() != user_manager::USER_TYPE_SUPERVISED ||
         user_manager::UserManager::Get()->AreSupervisedUsersAllowed();
-    bool meets_whitelist_requirements =
-        CrosSettings::IsWhitelisted((*it)->email(), nullptr) ||
-        !(*it)->HasGaiaAccount();
+    const bool meets_whitelist_requirements =
+        CrosSettings::IsWhitelisted(user->email(), nullptr) ||
+        !user->HasGaiaAccount();
 
     // Public session accounts are always shown on login screen.
-    bool meets_show_users_requirements =
+    const bool meets_show_users_requirements =
         show_users_on_signin ||
-        (*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
+        user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
     if (meets_supervised_requirements &&
         meets_whitelist_requirements &&
         meets_show_users_requirements) {
-      filtered_users.push_back(*it);
+      filtered_users.push_back(user);
     }
   }
 
   // If no user pods are visible, fallback to single new user pod which will
   // have guest session link.
   bool show_guest;
   cros_settings_->GetBoolean(kAccountsPrefAllowGuest, &show_guest);
   show_users_on_signin |= !filtered_users.empty();
   show_guest &= !filtered_users.empty();
   bool show_new_user = true;
@@ skipping 1002 matching lines @@
   }
 
   // Otherwise, show the unrecoverable cryptohome error UI and ask user's
   // permission to collect a feedback.
   RecordPasswordChangeFlow(LOGIN_PASSWORD_CHANGE_FLOW_CRYPTOHOME_FAILURE);
   VLOG(1) << "Show unrecoverable cryptohome error dialog.";
   login_display_->ShowUnrecoverableCrypthomeErrorDialog();
 }
 
 }  // namespace chromeos