| 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 const user_manager::User* user = | 1149 const user_manager::User* user = |
| 1150 ProfileHelper::Get()->GetUserByProfile(profile); | 1150 ProfileHelper::Get()->GetUserByProfile(profile); |
| 1151 if (user_manager->GetPrimaryUser() == user) { | 1151 if (user_manager->GetPrimaryUser() == user) { |
| 1152 InitRlz(profile); | 1152 InitRlz(profile); |
| 1153 InitializeCerts(profile); | 1153 InitializeCerts(profile); |
| 1154 InitializeCRLSetFetcher(user); | 1154 InitializeCRLSetFetcher(user); |
| 1155 InitializeCertificateTransparencyComponents(user); | 1155 InitializeCertificateTransparencyComponents(user); |
| 1156 | 1156 |
| 1157 if (arc::ArcBridgeService::GetEnabled( | 1157 if (arc::ArcBridgeService::GetEnabled( |
| 1158 base::CommandLine::ForCurrentProcess())) { | 1158 base::CommandLine::ForCurrentProcess())) { |
| 1159 const AccountId& account_id = |
| 1160 multi_user_util::GetAccountIdFromProfile(profile); |
| 1159 DCHECK(arc::ArcServiceManager::Get()); | 1161 DCHECK(arc::ArcServiceManager::Get()); |
| 1160 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( | 1162 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( |
| 1161 multi_user_util::GetAccountIdFromProfile(profile)); | 1163 account_id, profile->GetPrefs()); |
| 1162 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); | 1164 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); |
| 1163 DCHECK(arc_auth_service); | 1165 DCHECK(arc_auth_service); |
| 1164 arc_auth_service->OnPrimaryUserProfilePrepared(profile); | 1166 arc_auth_service->OnPrimaryUserProfilePrepared(profile); |
| 1165 } | 1167 } |
| 1166 } | 1168 } |
| 1167 | 1169 |
| 1168 UpdateEasyUnlockKeys(user_context_); | 1170 UpdateEasyUnlockKeys(user_context_); |
| 1169 user_context_.ClearSecrets(); | 1171 user_context_.ClearSecrets(); |
| 1170 if (TokenHandlesEnabled()) { | 1172 if (TokenHandlesEnabled()) { |
| 1171 CreateTokenUtilIfMissing(); | 1173 CreateTokenUtilIfMissing(); |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1831 token_handle_util_.reset(); | 1833 token_handle_util_.reset(); |
| 1832 first_run::GoodiesDisplayer::Delete(); | 1834 first_run::GoodiesDisplayer::Delete(); |
| 1833 } | 1835 } |
| 1834 | 1836 |
| 1835 void UserSessionManager::CreateTokenUtilIfMissing() { | 1837 void UserSessionManager::CreateTokenUtilIfMissing() { |
| 1836 if (!token_handle_util_.get()) | 1838 if (!token_handle_util_.get()) |
| 1837 token_handle_util_.reset(new TokenHandleUtil()); | 1839 token_handle_util_.reset(new TokenHandleUtil()); |
| 1838 } | 1840 } |
| 1839 | 1841 |
| 1840 } // namespace chromeos | 1842 } // namespace chromeos |
| OLD | NEW |