Chromium Code Reviews| 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 bd509844daf12c690d031873779fa1190a00cc8c..307a579ecf5fc16c486d0fb8f150f33d03c697eb 100644 |
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc |
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc |
| @@ -1279,7 +1279,8 @@ bool UserSessionManager::InitializeUserSession(Profile* profile) { |
| user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
| // Kiosk apps has their own session initialization pipeline. |
| - if (user_manager->IsLoggedInAsKioskApp()) |
| + if (user_manager->IsLoggedInAsKioskApp() || |
| + user_manager->IsLoggedInAsArcKioskApp()) |
|
Luis Héctor Chávez
2017/01/24 18:40:24
nit: you cannot elide braces if the condition span
Sergey Poromov
2017/01/25 14:29:22
Done.
|
| return false; |
| if (start_session_type_ == PRIMARY_USER_SESSION) { |