OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1212 user_manager::known_user::UpdateUsingSAML(user_context_.GetAccountId(), | 1212 user_manager::known_user::UpdateUsingSAML(user_context_.GetAccountId(), |
1213 true); | 1213 true); |
1214 SAMLOfflineSigninLimiter* saml_offline_signin_limiter = | 1214 SAMLOfflineSigninLimiter* saml_offline_signin_limiter = |
1215 SAMLOfflineSigninLimiterFactory::GetForProfile(profile); | 1215 SAMLOfflineSigninLimiterFactory::GetForProfile(profile); |
1216 if (saml_offline_signin_limiter) | 1216 if (saml_offline_signin_limiter) |
1217 saml_offline_signin_limiter->SignedIn(user_context_.GetAuthFlow()); | 1217 saml_offline_signin_limiter->SignedIn(user_context_.GetAuthFlow()); |
1218 } | 1218 } |
1219 | 1219 |
1220 profile->OnLogin(); | 1220 profile->OnLogin(); |
1221 | 1221 |
1222 session_manager::SessionManager::Get()->SetSessionState( | 1222 // Skip LOGGED_IN_NOT_ACTIVE state for kiosk launching so that login dialog |
1223 session_manager::SessionState::LOGGED_IN_NOT_ACTIVE); | 1223 // such as network config during launch is put on top of the login screen. |
| 1224 if (!user_manager->IsLoggedInAsKioskApp()) { |
| 1225 session_manager::SessionManager::Get()->SetSessionState( |
| 1226 session_manager::SessionState::LOGGED_IN_NOT_ACTIVE); |
| 1227 } |
1224 | 1228 |
1225 // Send the notification before creating the browser so additional objects | 1229 // Send the notification before creating the browser so additional objects |
1226 // that need the profile (e.g. the launcher) can be created first. | 1230 // that need the profile (e.g. the launcher) can be created first. |
1227 content::NotificationService::current()->Notify( | 1231 content::NotificationService::current()->Notify( |
1228 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 1232 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
1229 content::NotificationService::AllSources(), | 1233 content::NotificationService::AllSources(), |
1230 content::Details<Profile>(profile)); | 1234 content::Details<Profile>(profile)); |
1231 | 1235 |
1232 // Initialize various services only for primary user. | 1236 // Initialize various services only for primary user. |
1233 const user_manager::User* user = | 1237 const user_manager::User* user = |
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1958 ->browser_policy_connector_chromeos() | 1962 ->browser_policy_connector_chromeos() |
1959 ->IsEnterpriseManaged()) { | 1963 ->IsEnterpriseManaged()) { |
1960 return false; | 1964 return false; |
1961 } | 1965 } |
1962 | 1966 |
1963 // Do not show end of life notification if this is a guest session | 1967 // Do not show end of life notification if this is a guest session |
1964 return !profile->IsGuestSession(); | 1968 return !profile->IsGuestSession(); |
1965 } | 1969 } |
1966 | 1970 |
1967 } // namespace chromeos | 1971 } // namespace chromeos |
OLD | NEW |