Chromium Code Reviews| 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 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1272 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback, | 1272 base::Bind(&UserSessionManager::ChildAccountStatusReceivedCallback, | 
| 1273 weak_factory_.GetWeakPtr(), profile)); | 1273 weak_factory_.GetWeakPtr(), profile)); | 
| 1274 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( | 1274 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( | 
| 1275 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving, | 1275 FROM_HERE, base::Bind(&UserSessionManager::StopChildStatusObserving, | 
| 1276 weak_factory_.GetWeakPtr(), profile), | 1276 weak_factory_.GetWeakPtr(), profile), | 
| 1277 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs)); | 1277 base::TimeDelta::FromMilliseconds(kFlagsFetchingLoginTimeoutMs)); | 
| 1278 | 1278 | 
| 1279 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 1279 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 
| 1280 | 1280 | 
| 1281 // Kiosk apps has their own session initialization pipeline. | 1281 // Kiosk apps has their own session initialization pipeline. | 
| 1282 if (user_manager->IsLoggedInAsKioskApp()) | 1282 if (user_manager->IsLoggedInAsKioskApp() || | 
| 1283 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.
 
 | |
| 1283 return false; | 1284 return false; | 
| 1284 | 1285 | 
| 1285 if (start_session_type_ == PRIMARY_USER_SESSION) { | 1286 if (start_session_type_ == PRIMARY_USER_SESSION) { | 
| 1286 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); | 1287 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); | 
| 1287 WizardController* oobe_controller = WizardController::default_controller(); | 1288 WizardController* oobe_controller = WizardController::default_controller(); | 
| 1288 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); | 1289 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); | 
| 1289 bool skip_post_login_screens = | 1290 bool skip_post_login_screens = | 
| 1290 user_flow->ShouldSkipPostLoginScreens() || | 1291 user_flow->ShouldSkipPostLoginScreens() || | 
| 1291 (oobe_controller && oobe_controller->skip_post_login_screens()) || | 1292 (oobe_controller && oobe_controller->skip_post_login_screens()) || | 
| 1292 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); | 1293 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); | 
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1871 ->browser_policy_connector_chromeos() | 1872 ->browser_policy_connector_chromeos() | 
| 1872 ->IsEnterpriseManaged()) { | 1873 ->IsEnterpriseManaged()) { | 
| 1873 return false; | 1874 return false; | 
| 1874 } | 1875 } | 
| 1875 | 1876 | 
| 1876 // Do not show end of life notification if this is a guest session | 1877 // Do not show end of life notification if this is a guest session | 
| 1877 return !profile->IsGuestSession(); | 1878 return !profile->IsGuestSession(); | 
| 1878 } | 1879 } | 
| 1879 | 1880 | 
| 1880 } // namespace chromeos | 1881 } // namespace chromeos | 
| OLD | NEW |