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 14 matching lines...) Expand all Loading... |
25 #include "base/threading/thread_task_runner_handle.h" | 25 #include "base/threading/thread_task_runner_handle.h" |
26 #include "base/threading/worker_pool.h" | 26 #include "base/threading/worker_pool.h" |
27 #include "chrome/browser/about_flags.h" | 27 #include "chrome/browser/about_flags.h" |
28 #include "chrome/browser/app_mode/app_mode_utils.h" | 28 #include "chrome/browser/app_mode/app_mode_utils.h" |
29 #include "chrome/browser/browser_process.h" | 29 #include "chrome/browser/browser_process.h" |
30 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 30 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
31 #include "chrome/browser/browser_shutdown.h" | 31 #include "chrome/browser/browser_shutdown.h" |
32 #include "chrome/browser/chrome_notification_types.h" | 32 #include "chrome/browser/chrome_notification_types.h" |
33 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 33 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
34 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 34 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 35 #include "chrome/browser/chromeos/arc/arc_data_manager.h" |
35 #include "chrome/browser/chromeos/base/locale_util.h" | 36 #include "chrome/browser/chromeos/base/locale_util.h" |
36 #include "chrome/browser/chromeos/boot_times_recorder.h" | 37 #include "chrome/browser/chromeos/boot_times_recorder.h" |
37 #include "chrome/browser/chromeos/first_run/first_run.h" | 38 #include "chrome/browser/chromeos/first_run/first_run.h" |
38 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" | 39 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" |
39 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 40 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
40 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" | 41 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" |
41 #include "chrome/browser/chromeos/login/chrome_restart_request.h" | 42 #include "chrome/browser/chromeos/login/chrome_restart_request.h" |
42 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" | 43 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
43 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" | 44 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" |
44 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 45 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
(...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1155 InitializeCertificateTransparencyComponents(user); | 1156 InitializeCertificateTransparencyComponents(user); |
1156 | 1157 |
1157 if (arc::ArcBridgeService::GetEnabled( | 1158 if (arc::ArcBridgeService::GetEnabled( |
1158 base::CommandLine::ForCurrentProcess())) { | 1159 base::CommandLine::ForCurrentProcess())) { |
1159 DCHECK(arc::ArcServiceManager::Get()); | 1160 DCHECK(arc::ArcServiceManager::Get()); |
1160 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( | 1161 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( |
1161 multi_user_util::GetAccountIdFromProfile(profile)); | 1162 multi_user_util::GetAccountIdFromProfile(profile)); |
1162 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); | 1163 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); |
1163 DCHECK(arc_auth_service); | 1164 DCHECK(arc_auth_service); |
1164 arc_auth_service->OnPrimaryUserProfilePrepared(profile); | 1165 arc_auth_service->OnPrimaryUserProfilePrepared(profile); |
| 1166 DCHECK(arc::ArcDataManager::Get()); |
| 1167 arc::ArcDataManager::Get()->ClearIfDisabled(profile); |
1165 } | 1168 } |
1166 } | 1169 } |
1167 | 1170 |
1168 UpdateEasyUnlockKeys(user_context_); | 1171 UpdateEasyUnlockKeys(user_context_); |
1169 user_context_.ClearSecrets(); | 1172 user_context_.ClearSecrets(); |
1170 if (TokenHandlesEnabled()) { | 1173 if (TokenHandlesEnabled()) { |
1171 CreateTokenUtilIfMissing(); | 1174 CreateTokenUtilIfMissing(); |
1172 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) { | 1175 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) { |
1173 if (!token_handle_fetcher_.get()) { | 1176 if (!token_handle_fetcher_.get()) { |
1174 token_handle_fetcher_.reset(new TokenHandleFetcher( | 1177 token_handle_fetcher_.reset(new TokenHandleFetcher( |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1831 token_handle_util_.reset(); | 1834 token_handle_util_.reset(); |
1832 first_run::GoodiesDisplayer::Delete(); | 1835 first_run::GoodiesDisplayer::Delete(); |
1833 } | 1836 } |
1834 | 1837 |
1835 void UserSessionManager::CreateTokenUtilIfMissing() { | 1838 void UserSessionManager::CreateTokenUtilIfMissing() { |
1836 if (!token_handle_util_.get()) | 1839 if (!token_handle_util_.get()) |
1837 token_handle_util_.reset(new TokenHandleUtil()); | 1840 token_handle_util_.reset(new TokenHandleUtil()); |
1838 } | 1841 } |
1839 | 1842 |
1840 } // namespace chromeos | 1843 } // namespace chromeos |
OLD | NEW |