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

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

Issue 1264703003: Implement debugging local unlock keys in chrome://proximity-auth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + fixes Created 5 years, 5 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/easy_unlock_service.h ('k') | components/proximity_auth.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service.cc
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
index 4ccbcda307e4020cac3f421746b0838d3a5579ab..0faff50b9f1fe1513dbaf256afa48b80beecd6ce 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -288,6 +288,7 @@ void EasyUnlockService::RegisterProfilePrefs(
false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ proximity_auth::CryptAuthGCMManager::RegisterPrefs(registry);
proximity_auth::CryptAuthDeviceManager::RegisterPrefs(registry);
proximity_auth::CryptAuthEnrollmentManager::RegisterPrefs(registry);
@@ -687,6 +688,11 @@ cryptauth::DeviceClassifier EasyUnlockService::GetDeviceClassifier() {
return device_classifier;
}
+std::string EasyUnlockService::GetAccountId() {
+ return SigninManagerFactory::GetForProfile(profile())
+ ->GetAuthenticatedAccountId();
+}
+
gcm::GCMDriver* EasyUnlockService::GetGCMDriver() {
gcm::GCMProfileService* gcm_profile_service =
gcm::GCMProfileServiceFactory::GetForProfile(profile_);
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.h ('k') | components/proximity_auth.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698