| 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 27 matching lines...) Expand all Loading... |
| 38 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" | 38 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" |
| 39 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 39 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 40 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" | 40 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" |
| 41 #include "chrome/browser/chromeos/login/chrome_restart_request.h" | 41 #include "chrome/browser/chromeos/login/chrome_restart_request.h" |
| 42 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" | 42 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
| 43 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" | 43 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" |
| 44 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 44 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 45 #include "chrome/browser/chromeos/login/helper.h" | 45 #include "chrome/browser/chromeos/login/helper.h" |
| 46 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 46 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 47 #include "chrome/browser/chromeos/login/profile_auth_data.h" | 47 #include "chrome/browser/chromeos/login/profile_auth_data.h" |
| 48 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
| 49 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h" |
| 48 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" | 50 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" |
| 49 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory
.h" | 51 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory
.h" |
| 50 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 52 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
| 51 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 53 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
| 52 #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h" | 54 #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h" |
| 53 #include "chrome/browser/chromeos/login/startup_utils.h" | 55 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 54 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" | 56 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" |
| 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 57 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 56 #include "chrome/browser/chromeos/login/user_flow.h" | 58 #include "chrome/browser/chromeos/login/user_flow.h" |
| 57 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 | 1270 |
| 1269 if (start_session_type_ == PRIMARY_USER_SESSION) { | 1271 if (start_session_type_ == PRIMARY_USER_SESSION) { |
| 1270 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); | 1272 UserFlow* user_flow = ChromeUserManager::Get()->GetCurrentUserFlow(); |
| 1271 WizardController* oobe_controller = WizardController::default_controller(); | 1273 WizardController* oobe_controller = WizardController::default_controller(); |
| 1272 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); | 1274 base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); |
| 1273 bool skip_post_login_screens = | 1275 bool skip_post_login_screens = |
| 1274 user_flow->ShouldSkipPostLoginScreens() || | 1276 user_flow->ShouldSkipPostLoginScreens() || |
| 1275 (oobe_controller && oobe_controller->skip_post_login_screens()) || | 1277 (oobe_controller && oobe_controller->skip_post_login_screens()) || |
| 1276 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); | 1278 cmdline->HasSwitch(chromeos::switches::kOobeSkipPostLogin); |
| 1277 | 1279 |
| 1280 // The user just signed into the profile session, so it means that they |
| 1281 // entered a password (or used easy unlock). We will enable quick unlock. |
| 1282 PinStorage* pin_storage = PinStorageFactory::GetForProfile(profile); |
| 1283 if (pin_storage) |
| 1284 pin_storage->MarkStrongAuth(); |
| 1285 |
| 1278 if (user_manager->IsCurrentUserNew() && !skip_post_login_screens) { | 1286 if (user_manager->IsCurrentUserNew() && !skip_post_login_screens) { |
| 1279 // Don't specify start URLs if the administrator has configured the start | 1287 // Don't specify start URLs if the administrator has configured the start |
| 1280 // URLs via policy. | 1288 // URLs via policy. |
| 1281 if (!SessionStartupPref::TypeIsManaged(profile->GetPrefs())) { | 1289 if (!SessionStartupPref::TypeIsManaged(profile->GetPrefs())) { |
| 1282 if (child_service->IsChildAccountStatusKnown()) | 1290 if (child_service->IsChildAccountStatusKnown()) |
| 1283 InitializeStartUrls(); | 1291 InitializeStartUrls(); |
| 1284 else | 1292 else |
| 1285 waiting_for_child_account_status_ = true; | 1293 waiting_for_child_account_status_ = true; |
| 1286 } | 1294 } |
| 1287 | 1295 |
| (...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1831 token_handle_util_.reset(); | 1839 token_handle_util_.reset(); |
| 1832 first_run::GoodiesDisplayer::Delete(); | 1840 first_run::GoodiesDisplayer::Delete(); |
| 1833 } | 1841 } |
| 1834 | 1842 |
| 1835 void UserSessionManager::CreateTokenUtilIfMissing() { | 1843 void UserSessionManager::CreateTokenUtilIfMissing() { |
| 1836 if (!token_handle_util_.get()) | 1844 if (!token_handle_util_.get()) |
| 1837 token_handle_util_.reset(new TokenHandleUtil()); | 1845 token_handle_util_.reset(new TokenHandleUtil()); |
| 1838 } | 1846 } |
| 1839 | 1847 |
| 1840 } // namespace chromeos | 1848 } // namespace chromeos |
| OLD | NEW |