| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 // Transfers authentication-related data from the profile that was used for | 579 // Transfers authentication-related data from the profile that was used for |
| 580 // authentication to the user's profile. The proxy authentication state is | 580 // authentication to the user's profile. The proxy authentication state is |
| 581 // transferred unconditionally. If the user authenticated via an auth | 581 // transferred unconditionally. If the user authenticated via an auth |
| 582 // extension, authentication cookies and server bound certificates will be | 582 // extension, authentication cookies and server bound certificates will be |
| 583 // transferred as well, if the user's cookie jar is empty. If the cookie jar | 583 // transferred as well, if the user's cookie jar is empty. If the cookie jar |
| 584 // is not empty, the authentication states in the login profile and the | 584 // is not empty, the authentication states in the login profile and the |
| 585 // user's profile must be merged using /MergeSession instead. | 585 // user's profile must be merged using /MergeSession instead. |
| 586 ProfileAuthData::Transfer( | 586 ProfileAuthData::Transfer( |
| 587 authenticator_->authentication_profile(), | 587 authenticator_->authentication_profile(), |
| 588 profile, | 588 profile, |
| 589 has_auth_cookies_, // transfer_auth_cookies_and_server_bound_certs | 589 has_auth_cookies_, // transfer_auth_cookies_and_channel_ids |
| 590 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer, | 590 base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer, |
| 591 AsWeakPtr(), | 591 AsWeakPtr(), |
| 592 profile)); | 592 profile)); |
| 593 return; | 593 return; |
| 594 } | 594 } |
| 595 | 595 |
| 596 FinalizePrepareProfile(profile); | 596 FinalizePrepareProfile(profile); |
| 597 } | 597 } |
| 598 | 598 |
| 599 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( | 599 void UserSessionManager::CompleteProfileCreateAfterAuthTransfer( |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 primary_user && | 752 primary_user && |
| 753 profile == ProfileHelper::Get()->GetProfileByUser(primary_user) && | 753 profile == ProfileHelper::Get()->GetProfileByUser(primary_user) && |
| 754 CertLoader::IsInitialized() && | 754 CertLoader::IsInitialized() && |
| 755 base::SysInfo::IsRunningOnChromeOS()) { | 755 base::SysInfo::IsRunningOnChromeOS()) { |
| 756 GetNSSCertDatabaseForProfile(profile, | 756 GetNSSCertDatabaseForProfile(profile, |
| 757 base::Bind(&OnGetNSSCertDatabaseForUser)); | 757 base::Bind(&OnGetNSSCertDatabaseForUser)); |
| 758 } | 758 } |
| 759 } | 759 } |
| 760 | 760 |
| 761 } // namespace chromeos | 761 } // namespace chromeos |
| OLD | NEW |