| 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/signin/easy_unlock_service_regular.h" | 5 #include "chrome/browser/signin/easy_unlock_service_regular.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 #else | 180 #else |
| 181 OpenSetupApp(); | 181 OpenSetupApp(); |
| 182 #endif | 182 #endif |
| 183 } | 183 } |
| 184 | 184 |
| 185 #if defined(OS_CHROMEOS) | 185 #if defined(OS_CHROMEOS) |
| 186 void EasyUnlockServiceRegular::OnUserContextFromReauth( | 186 void EasyUnlockServiceRegular::OnUserContextFromReauth( |
| 187 const chromeos::UserContext& user_context) { | 187 const chromeos::UserContext& user_context) { |
| 188 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 188 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 189 short_lived_user_context_.reset(new chromeos::ShortLivedUserContext( | 189 short_lived_user_context_.reset(new chromeos::ShortLivedUserContext( |
| 190 user_context, apps::AppLifetimeMonitorFactory::GetForProfile(profile()), | 190 user_context, |
| 191 apps::AppLifetimeMonitorFactory::GetForBrowserContext(profile()), |
| 191 base::ThreadTaskRunnerHandle::Get().get())); | 192 base::ThreadTaskRunnerHandle::Get().get())); |
| 192 | 193 |
| 193 OpenSetupApp(); | 194 OpenSetupApp(); |
| 194 | 195 |
| 195 // Use this opportunity to clear the crytohome keys if it was not already | 196 // Use this opportunity to clear the crytohome keys if it was not already |
| 196 // cleared earlier. | 197 // cleared earlier. |
| 197 const base::ListValue* devices = GetRemoteDevices(); | 198 const base::ListValue* devices = GetRemoteDevices(); |
| 198 if (!devices || devices->empty()) { | 199 if (!devices || devices->empty()) { |
| 199 chromeos::EasyUnlockKeyManager* key_manager = | 200 chromeos::EasyUnlockKeyManager* key_manager = |
| 200 chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager(); | 201 chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager(); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 | 591 |
| 591 cryptauth::CryptAuthDeviceManager* | 592 cryptauth::CryptAuthDeviceManager* |
| 592 EasyUnlockServiceRegular::GetCryptAuthDeviceManager() { | 593 EasyUnlockServiceRegular::GetCryptAuthDeviceManager() { |
| 593 cryptauth::CryptAuthDeviceManager* manager = | 594 cryptauth::CryptAuthDeviceManager* manager = |
| 594 ChromeCryptAuthServiceFactory::GetInstance() | 595 ChromeCryptAuthServiceFactory::GetInstance() |
| 595 ->GetForBrowserContext(profile()) | 596 ->GetForBrowserContext(profile()) |
| 596 ->GetCryptAuthDeviceManager(); | 597 ->GetCryptAuthDeviceManager(); |
| 597 DCHECK(manager); | 598 DCHECK(manager); |
| 598 return manager; | 599 return manager; |
| 599 } | 600 } |
| OLD | NEW |