Index: chrome/browser/chromeos/login/session/user_session_manager.cc |
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc |
index 607e9fa10a0bc70e0dd31f019e2fffda757bf6a7..f37ca1d9f1ed56899a561709d3fd27b0641fe639 100644 |
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc |
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc |
@@ -1219,8 +1219,12 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) { |
profile->OnLogin(); |
- session_manager::SessionManager::Get()->SetSessionState( |
- session_manager::SessionState::LOGGED_IN_NOT_ACTIVE); |
+ // Skip LOGGED_IN_NOT_ACTIVE state for kiosk launching so that login dialog |
+ // such as network config during launch is put on top of the login screen. |
+ if (!user_manager->IsLoggedInAsKioskApp()) { |
+ session_manager::SessionManager::Get()->SetSessionState( |
+ session_manager::SessionState::LOGGED_IN_NOT_ACTIVE); |
+ } |
// Send the notification before creating the browser so additional objects |
// that need the profile (e.g. the launcher) can be created first. |