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 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1147 | 1147 |
1148 if (arc::ArcBridgeService::GetEnabled( | 1148 if (arc::ArcBridgeService::GetEnabled( |
1149 base::CommandLine::ForCurrentProcess())) { | 1149 base::CommandLine::ForCurrentProcess())) { |
1150 const AccountId& account_id = | 1150 const AccountId& account_id = |
1151 multi_user_util::GetAccountIdFromProfile(profile); | 1151 multi_user_util::GetAccountIdFromProfile(profile); |
1152 std::unique_ptr<BooleanPrefMember> arc_enabled_pref = | 1152 std::unique_ptr<BooleanPrefMember> arc_enabled_pref = |
1153 base::MakeUnique<BooleanPrefMember>(); | 1153 base::MakeUnique<BooleanPrefMember>(); |
1154 arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs()); | 1154 arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs()); |
1155 DCHECK(arc::ArcServiceManager::Get()); | 1155 DCHECK(arc::ArcServiceManager::Get()); |
1156 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( | 1156 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( |
1157 account_id, std::move(arc_enabled_pref)); | 1157 account_id, profile, std::move(arc_enabled_pref)); |
1158 arc::ArcSessionManager* arc_session_manager = | 1158 arc::ArcSessionManager* arc_session_manager = |
1159 arc::ArcSessionManager::Get(); | 1159 arc::ArcSessionManager::Get(); |
1160 DCHECK(arc_session_manager); | 1160 DCHECK(arc_session_manager); |
1161 arc_session_manager->OnPrimaryUserProfilePrepared(profile); | 1161 arc_session_manager->OnPrimaryUserProfilePrepared(profile); |
1162 } | 1162 } |
1163 } | 1163 } |
1164 | 1164 |
1165 UpdateEasyUnlockKeys(user_context_); | 1165 UpdateEasyUnlockKeys(user_context_); |
1166 user_context_.ClearSecrets(); | 1166 user_context_.ClearSecrets(); |
1167 if (TokenHandlesEnabled()) { | 1167 if (TokenHandlesEnabled()) { |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1870 ->browser_policy_connector_chromeos() | 1870 ->browser_policy_connector_chromeos() |
1871 ->IsEnterpriseManaged()) { | 1871 ->IsEnterpriseManaged()) { |
1872 return false; | 1872 return false; |
1873 } | 1873 } |
1874 | 1874 |
1875 // Do not show end of life notification if this is a guest session | 1875 // Do not show end of life notification if this is a guest session |
1876 return !profile->IsGuestSession(); | 1876 return !profile->IsGuestSession(); |
1877 } | 1877 } |
1878 | 1878 |
1879 } // namespace chromeos | 1879 } // namespace chromeos |
OLD | NEW |