Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2145813002: Clear old ARC instance before opt-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 1159
1160 if (arc::ArcBridgeService::GetEnabled( 1160 if (arc::ArcBridgeService::GetEnabled(
1161 base::CommandLine::ForCurrentProcess())) { 1161 base::CommandLine::ForCurrentProcess())) {
1162 const AccountId& account_id = 1162 const AccountId& account_id =
1163 multi_user_util::GetAccountIdFromProfile(profile); 1163 multi_user_util::GetAccountIdFromProfile(profile);
1164 std::unique_ptr<BooleanPrefMember> arc_enabled_pref = 1164 std::unique_ptr<BooleanPrefMember> arc_enabled_pref =
1165 base::MakeUnique<BooleanPrefMember>(); 1165 base::MakeUnique<BooleanPrefMember>();
1166 arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs()); 1166 arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs());
1167 DCHECK(arc::ArcServiceManager::Get()); 1167 DCHECK(arc::ArcServiceManager::Get());
1168 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared( 1168 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
1169 account_id, std::move(arc_enabled_pref)); 1169 account_id, std::move(arc_enabled_pref), profile->GetPrefs());
1170 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get(); 1170 arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
1171 DCHECK(arc_auth_service); 1171 DCHECK(arc_auth_service);
1172 arc_auth_service->OnPrimaryUserProfilePrepared(profile); 1172 arc_auth_service->OnPrimaryUserProfilePrepared(profile);
1173 } 1173 }
1174 } 1174 }
1175 1175
1176 UpdateEasyUnlockKeys(user_context_); 1176 UpdateEasyUnlockKeys(user_context_);
1177 user_context_.ClearSecrets(); 1177 user_context_.ClearSecrets();
1178 if (TokenHandlesEnabled()) { 1178 if (TokenHandlesEnabled()) {
1179 CreateTokenUtilIfMissing(); 1179 CreateTokenUtilIfMissing();
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 ->browser_policy_connector_chromeos() 1893 ->browser_policy_connector_chromeos()
1894 ->IsEnterpriseManaged()) { 1894 ->IsEnterpriseManaged()) {
1895 return false; 1895 return false;
1896 } 1896 }
1897 1897
1898 // Do not show end of life notification if this is a guest session 1898 // Do not show end of life notification if this is a guest session
1899 return !profile->IsGuestSession(); 1899 return !profile->IsGuestSession();
1900 } 1900 }
1901 1901
1902 } // namespace chromeos 1902 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698