Commit aba83971 authored by xiyuan's avatar xiyuan Committed by Commit Bot

kiosk: Skip LOGGED_IN_NOT_ACTIVE during app launch

Ash is changed that LOGGED_IN_NOT_ACTIVE is treated as
a non user blocking state so that browser windows during user
sign-in are can be activated before login screen is dismissed.
However a side effect of that is modal dialog under this state
will be placed in SystemModalContainer instead of
LockSystemModalContainer and causing the issue. The CL skips
LOGGED_IN_NOT_ACTIVE during app launch so that dialogs created
during the app launch are placed to the correct container.

BUG=727951

Review-Url: https://codereview.chromium.org/2915943002
Cr-Commit-Position: refs/heads/master@{#476327}
parent 8a05953a
......@@ -1219,8 +1219,12 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
profile->OnLogin();
// 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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment