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

Unified Diff: chrome/browser/signin/easy_unlock_service.h

Issue 1209193003: [Proximity Auth] Create one ProximityAuthClient per profile, rather than one global one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable tests on non-ChromeOS, since there's nothing left to test on the other platforms Created 5 years, 6 months 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
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service.h
diff --git a/chrome/browser/signin/easy_unlock_service.h b/chrome/browser/signin/easy_unlock_service.h
index 0b577c77a057888e30e4e5ba48c9610f50d8c8bd..ddf64c870fd33f4f1552b65a300bc7b8478a5cd5 100644
--- a/chrome/browser/signin/easy_unlock_service.h
+++ b/chrome/browser/signin/easy_unlock_service.h
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "chrome/browser/signin/chrome_proximity_auth_client.h"
#include "chrome/browser/signin/easy_unlock_auth_attempt.h"
#include "chrome/browser/signin/easy_unlock_metrics.h"
#include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
@@ -225,6 +226,10 @@ class EasyUnlockService : public KeyedService,
CreateCryptAuthClientFactory() override;
cryptauth::DeviceClassifier GetDeviceClassifier() override;
+ ChromeProximityAuthClient* proximity_auth_client() {
+ return &proximity_auth_client_;
+ }
+
protected:
explicit EasyUnlockService(Profile* profile);
~EasyUnlockService() override;
@@ -328,7 +333,9 @@ class EasyUnlockService : public KeyedService,
void EnsureTpmKeyPresentIfNeeded();
- Profile* profile_;
+ Profile* const profile_;
+
+ ChromeProximityAuthClient proximity_auth_client_;
scoped_ptr<EasyUnlockAppManager> app_manager_;
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.cc ('k') | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698