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

Unified Diff: components/proximity_auth/proximity_auth_system.h

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 side-by-side diff with in-line comments
Download patch
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_;
« no previous file with comments | « components/proximity_auth/messenger_impl_unittest.cc ('k') | components/proximity_auth/proximity_auth_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698