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

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

Issue 2560713002: Move RemoteDevice from //components/proximity_auth to //components/cryptauth so that it can be easi… (Closed)
Patch Set: Add cryptauth dependency. Created 4 years 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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 return PASSWORD_ENTRY_WITH_AUTHENTICATED_PHONE; 837 return PASSWORD_ENTRY_WITH_AUTHENTICATED_PHONE;
838 } 838 }
839 } 839 }
840 840
841 NOTREACHED(); 841 NOTREACHED();
842 return EASY_UNLOCK_AUTH_EVENT_COUNT; 842 return EASY_UNLOCK_AUTH_EVENT_COUNT;
843 } 843 }
844 844
845 void EasyUnlockService::SetProximityAuthDevices( 845 void EasyUnlockService::SetProximityAuthDevices(
846 const AccountId& account_id, 846 const AccountId& account_id,
847 const proximity_auth::RemoteDeviceList& remote_devices) { 847 const cryptauth::RemoteDeviceList& remote_devices) {
848 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 848 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
849 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) 849 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))
850 return; 850 return;
851 851
852 if (!proximity_auth_system_) { 852 if (!proximity_auth_system_) {
853 PA_LOG(INFO) << "Creating ProximityAuthSystem."; 853 PA_LOG(INFO) << "Creating ProximityAuthSystem.";
854 proximity_auth_system_.reset(new proximity_auth::ProximityAuthSystem( 854 proximity_auth_system_.reset(new proximity_auth::ProximityAuthSystem(
855 GetType() == TYPE_SIGNIN 855 GetType() == TYPE_SIGNIN
856 ? proximity_auth::ProximityAuthSystem::SIGN_IN 856 ? proximity_auth::ProximityAuthSystem::SIGN_IN
857 : proximity_auth::ProximityAuthSystem::SESSION_LOCK, 857 : proximity_auth::ProximityAuthSystem::SESSION_LOCK,
(...skipping 61 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/easy_unlock_service.h ('k') | chrome/browser/signin/easy_unlock_service_regular.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698