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

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

Issue 2502343003: Moved //components/proximity_auth/cryptauth to //components/cryptauth. (Closed)
Patch Set: Fixed proto #includes. Created 4 years, 1 month 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.h ('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/chrome_proximity_auth_client.cc
diff --git a/chrome/browser/signin/chrome_proximity_auth_client.cc b/chrome/browser/signin/chrome_proximity_auth_client.cc
index a5a21d3804472ea75c1afb3fcd045ce70ce312ab..25f64a87d8fe449ca88aa6393aa3d3570c2a03d3 100644
--- a/chrome/browser/signin/chrome_proximity_auth_client.cc
+++ b/chrome/browser/signin/chrome_proximity_auth_client.cc
@@ -17,11 +17,11 @@
#include "chrome/browser/signin/easy_unlock_service_regular.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "components/cryptauth/cryptauth_client_impl.h"
+#include "components/cryptauth/cryptauth_device_manager.h"
+#include "components/cryptauth/cryptauth_enrollment_manager.h"
+#include "components/cryptauth/secure_message_delegate.h"
#include "components/prefs/pref_service.h"
-#include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"
-#include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
-#include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
-#include "components/proximity_auth/cryptauth/secure_message_delegate.h"
#include "components/proximity_auth/logging/logging.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager_base.h"
@@ -94,7 +94,7 @@ PrefService* ChromeProximityAuthClient::GetPrefService() {
return profile_->GetPrefs();
}
-std::unique_ptr<proximity_auth::SecureMessageDelegate>
+std::unique_ptr<cryptauth::SecureMessageDelegate>
ChromeProximityAuthClient::CreateSecureMessageDelegate() {
#if defined(OS_CHROMEOS)
return base::MakeUnique<chromeos::SecureMessageDelegateChromeOS>();
@@ -103,9 +103,9 @@ ChromeProximityAuthClient::CreateSecureMessageDelegate() {
#endif
}
-std::unique_ptr<proximity_auth::CryptAuthClientFactory>
+std::unique_ptr<cryptauth::CryptAuthClientFactory>
ChromeProximityAuthClient::CreateCryptAuthClientFactory() {
- return base::MakeUnique<proximity_auth::CryptAuthClientFactoryImpl>(
+ return base::MakeUnique<cryptauth::CryptAuthClientFactoryImpl>(
ProfileOAuth2TokenServiceFactory::GetForProfile(profile_), GetAccountId(),
profile_->GetRequestContext(), GetDeviceClassifier());
}
@@ -141,7 +141,7 @@ std::string ChromeProximityAuthClient::GetAccountId() {
->GetAuthenticatedAccountId();
}
-proximity_auth::CryptAuthEnrollmentManager*
+cryptauth::CryptAuthEnrollmentManager*
ChromeProximityAuthClient::GetCryptAuthEnrollmentManager() {
EasyUnlockServiceRegular* easy_unlock_service = GetEasyUnlockServiceRegular();
if (!easy_unlock_service)
@@ -149,7 +149,7 @@ ChromeProximityAuthClient::GetCryptAuthEnrollmentManager() {
return easy_unlock_service->GetCryptAuthEnrollmentManager();
}
-proximity_auth::CryptAuthDeviceManager*
+cryptauth::CryptAuthDeviceManager*
ChromeProximityAuthClient::GetCryptAuthDeviceManager() {
EasyUnlockServiceRegular* easy_unlock_service = GetEasyUnlockServiceRegular();
if (!easy_unlock_service)
« no previous file with comments | « chrome/browser/signin/chrome_proximity_auth_client.h ('k') | chrome/browser/signin/easy_unlock_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698