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

Side by Side Diff: chrome/browser/signin/easy_unlock_service.cc

Issue 2502343003: Moved //components/proximity_auth/cryptauth to //components/cryptauth. (Closed)
Patch Set: Fixed proto #includes. Created 4 years, 1 month 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/signin/easy_unlock_service.h" 5 #include "chrome/browser/signin/easy_unlock_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "apps/app_lifetime_monitor.h" 9 #include "apps/app_lifetime_monitor.h"
10 #include "apps/app_lifetime_monitor_factory.h" 10 #include "apps/app_lifetime_monitor_factory.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/signin/chrome_proximity_auth_client.h" 25 #include "chrome/browser/signin/chrome_proximity_auth_client.h"
26 #include "chrome/browser/signin/easy_unlock_app_manager.h" 26 #include "chrome/browser/signin/easy_unlock_app_manager.h"
27 #include "chrome/browser/signin/easy_unlock_service_factory.h" 27 #include "chrome/browser/signin/easy_unlock_service_factory.h"
28 #include "chrome/browser/signin/easy_unlock_service_observer.h" 28 #include "chrome/browser/signin/easy_unlock_service_observer.h"
29 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 29 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
30 #include "chrome/browser/signin/signin_manager_factory.h" 30 #include "chrome/browser/signin/signin_manager_factory.h"
31 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/extensions/extension_constants.h" 32 #include "chrome/common/extensions/extension_constants.h"
33 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
34 #include "components/cryptauth/cryptauth_client_impl.h"
35 #include "components/cryptauth/cryptauth_device_manager.h"
36 #include "components/cryptauth/cryptauth_enrollment_manager.h"
37 #include "components/cryptauth/secure_message_delegate.h"
34 #include "components/pref_registry/pref_registry_syncable.h" 38 #include "components/pref_registry/pref_registry_syncable.h"
35 #include "components/prefs/pref_registry_simple.h" 39 #include "components/prefs/pref_registry_simple.h"
36 #include "components/prefs/pref_service.h" 40 #include "components/prefs/pref_service.h"
37 #include "components/prefs/scoped_user_pref_update.h" 41 #include "components/prefs/scoped_user_pref_update.h"
38 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"
39 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
40 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
41 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
42 #include "components/proximity_auth/logging/logging.h" 42 #include "components/proximity_auth/logging/logging.h"
43 #include "components/proximity_auth/proximity_auth_pref_manager.h" 43 #include "components/proximity_auth/proximity_auth_pref_manager.h"
44 #include "components/proximity_auth/proximity_auth_system.h" 44 #include "components/proximity_auth/proximity_auth_system.h"
45 #include "components/proximity_auth/screenlock_bridge.h" 45 #include "components/proximity_auth/screenlock_bridge.h"
46 #include "components/proximity_auth/switches.h" 46 #include "components/proximity_auth/switches.h"
47 #include "components/signin/core/browser/profile_oauth2_token_service.h" 47 #include "components/signin/core/browser/profile_oauth2_token_service.h"
48 #include "components/signin/core/browser/signin_manager.h" 48 #include "components/signin/core/browser/signin_manager.h"
49 #include "components/user_manager/user.h" 49 #include "components/user_manager/user.h"
50 #include "components/version_info/version_info.h" 50 #include "components/version_info/version_info.h"
51 #include "device/bluetooth/bluetooth_adapter.h" 51 #include "device/bluetooth/bluetooth_adapter.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 user_prefs::PrefRegistrySyncable* registry) { 280 user_prefs::PrefRegistrySyncable* registry) {
281 registry->RegisterBooleanPref(prefs::kEasyUnlockAllowed, true); 281 registry->RegisterBooleanPref(prefs::kEasyUnlockAllowed, true);
282 registry->RegisterBooleanPref(prefs::kEasyUnlockEnabled, false); 282 registry->RegisterBooleanPref(prefs::kEasyUnlockEnabled, false);
283 registry->RegisterDictionaryPref(prefs::kEasyUnlockPairing, 283 registry->RegisterDictionaryPref(prefs::kEasyUnlockPairing,
284 new base::DictionaryValue()); 284 new base::DictionaryValue());
285 registry->RegisterBooleanPref( 285 registry->RegisterBooleanPref(
286 prefs::kEasyUnlockProximityRequired, 286 prefs::kEasyUnlockProximityRequired,
287 false, 287 false,
288 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 288 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
289 289
290 proximity_auth::CryptAuthGCMManager::RegisterPrefs(registry); 290 cryptauth::CryptAuthGCMManager::RegisterPrefs(registry);
291 proximity_auth::CryptAuthDeviceManager::RegisterPrefs(registry); 291 cryptauth::CryptAuthDeviceManager::RegisterPrefs(registry);
292 proximity_auth::CryptAuthEnrollmentManager::RegisterPrefs(registry); 292 cryptauth::CryptAuthEnrollmentManager::RegisterPrefs(registry);
293 293
294 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 294 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
295 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) 295 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))
296 proximity_auth::ProximityAuthPrefManager::RegisterPrefs(registry); 296 proximity_auth::ProximityAuthPrefManager::RegisterPrefs(registry);
297 } 297 }
298 298
299 // static 299 // static
300 void EasyUnlockService::RegisterPrefs(PrefRegistrySimple* registry) { 300 void EasyUnlockService::RegisterPrefs(PrefRegistrySimple* registry) {
301 registry->RegisterStringPref(prefs::kEasyUnlockDeviceId, std::string()); 301 registry->RegisterStringPref(prefs::kEasyUnlockDeviceId, std::string());
302 registry->RegisterDictionaryPref(prefs::kEasyUnlockHardlockState); 302 registry->RegisterDictionaryPref(prefs::kEasyUnlockHardlockState);
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 919
920 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt 920 // TODO(tbarzic): Set check_private_key only if previous sign-in attempt
921 // failed. 921 // failed.
922 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) 922 EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)
923 ->PrepareTpmKey(true /* check_private_key */, 923 ->PrepareTpmKey(true /* check_private_key */,
924 base::Closure()); 924 base::Closure());
925 #endif // defined(OS_CHROMEOS) 925 #endif // defined(OS_CHROMEOS)
926 926
927 tpm_key_checked_ = true; 927 tpm_key_checked_ = true;
928 } 928 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698