| 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 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1280 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback, | 1280 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback, |
| 1281 weak_factory_.GetWeakPtr(), profile)); | 1281 weak_factory_.GetWeakPtr(), profile)); |
| 1282 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( | 1282 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
| 1283 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving, | 1283 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving, |
| 1284 weak_factory_.GetWeakPtr(), profile), | 1284 weak_factory_.GetWeakPtr(), profile), |
| 1285 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs)); | 1285 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs)); |
| 1286 | 1286 |
| 1287 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 1287 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
| 1288 | 1288 |
| 1289 // Kiosk apps has their own session initialization pipeline. | 1289 // Kiosk apps has their own session initialization pipeline. |
| 1290 if (user_manager->IsLoggedInAsKioskApp()) | 1290 if (user_manager->IsLoggedInAsKioskApp() || |
| 1291 user_manager->IsLoggedInAsArcKioskApp()) { |
| 1291 return false; | 1292 return false; |
| 1293 } |
| 1292 | 1294 |
| 1293 if (start_session_type_ == PRIMARY_USER_SESSION) { | 1295 if (start_session_type_ == PRIMARY_USER_SESSION) { |
| 1294 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); | 1296 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); |
| 1295 WizardController* oobe_controller = WizardController::default_controller(); | 1297 WizardController* oobe_controller = WizardController::default_controller(); |
| 1296 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); | 1298 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); |
| 1297 bool skip_post_login_screens = | 1299 bool skip_post_login_screens = |
| 1298 user_flow->ShouldSkipPostLoginScreens() || | 1300 user_flow->ShouldSkipPostLoginScreens() || |
| 1299 (oobe_controller && oobe_controller->skip_post_login_screens()) || | 1301 (oobe_controller && oobe_controller->skip_post_login_screens()) || |
| 1300 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); | 1302 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); |
| 1301 | 1303 |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1887 ->browser_policy_connector_chromeos() | 1889 ->browser_policy_connector_chromeos() |
| 1888 ->IsEnterpriseManaged()) { | 1890 ->IsEnterpriseManaged()) { |
| 1889 return false; | 1891 return false; |
| 1890 } | 1892 } |
| 1891 | 1893 |
| 1892 // Do not show end of life notification if this is a guest session | 1894 // Do not show end of life notification if this is a guest session |
| 1893 return !profile->IsGuestSession(); | 1895 return !profile->IsGuestSession(); |
| 1894 } | 1896 } |
| 1895 | 1897 |
| 1896 } // namespace chromeos | 1898 } // namespace chromeos |
| OLD | NEW |