| Index: components/proximity_auth/proximity_auth_system.h
|
| diff --git a/components/proximity_auth/proximity_auth_system.h b/components/proximity_auth/proximity_auth_system.h
|
| index f411a5ee0970fbcadfd86de9fea40d75c8602f6e..b6c1d657556c5d119456fbc0363fbb1d23e5a476 100644
|
| --- a/components/proximity_auth/proximity_auth_system.h
|
| +++ b/components/proximity_auth/proximity_auth_system.h
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "components/proximity_auth/remote_device.h"
|
| +#include "components/cryptauth/remote_device.h"
|
| #include "components/proximity_auth/remote_device_life_cycle.h"
|
| #include "components/proximity_auth/screenlock_bridge.h"
|
| #include "components/signin/core/account_id/account_id.h"
|
| @@ -45,13 +45,15 @@ class ProximityAuthSystem : public RemoteDeviceLifeCycle::Observer,
|
| // Registers a list of |remote_devices| for |account_id| that can be used for
|
| // sign-in/unlock. If devices were previously registered for the user, then
|
| // they will be replaced.
|
| - void SetRemoteDevicesForUser(const AccountId& account_id,
|
| - const RemoteDeviceList& remote_devices);
|
| + void SetRemoteDevicesForUser(
|
| + const AccountId& account_id,
|
| + const cryptauth::RemoteDeviceList& remote_devices);
|
|
|
| // Returns the RemoteDevices registered for |account_id|. Returns an empty
|
| // list
|
| // if no devices are registered for |account_id|.
|
| - RemoteDeviceList GetRemoteDevicesForUser(const AccountId& account_id) const;
|
| + cryptauth::RemoteDeviceList GetRemoteDevicesForUser(
|
| + const AccountId& account_id) const;
|
|
|
| // Called when the user clicks the user pod and attempts to unlock/sign-in.
|
| void OnAuthAttempted(const AccountId& account_id);
|
| @@ -79,7 +81,7 @@ class ProximityAuthSystem : public RemoteDeviceLifeCycle::Observer,
|
| void ResumeAfterWakeUpTimeout();
|
|
|
| // Lists of remote devices, keyed by user account id.
|
| - std::map<AccountId, RemoteDeviceList> remote_devices_map_;
|
| + std::map<AccountId, cryptauth::RemoteDeviceList> remote_devices_map_;
|
|
|
| // Delegate for Chrome dependent functionality.
|
| ProximityAuthClient* proximity_auth_client_;
|
|
|