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

Unified Diff: components/proximity_auth/proximity_auth_system.cc

Issue 2973243002: Adding pref to store the user-selected proximity threshold. (Closed)
Patch Set: Addressing DEPS issues Created 3 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
Index: components/proximity_auth/proximity_auth_system.cc
diff --git a/components/proximity_auth/proximity_auth_system.cc b/components/proximity_auth/proximity_auth_system.cc
index 1129cba388170cdfb09591d3cc0021f3e21ef4c2..03a423f929411404272bb3460ce1b2ed88813ab5 100644
--- a/components/proximity_auth/proximity_auth_system.cc
+++ b/components/proximity_auth/proximity_auth_system.cc
@@ -27,11 +27,12 @@ ProximityAuthSystem::ProximityAuthSystem(
ProximityAuthClient* proximity_auth_client)
: screenlock_type_(screenlock_type),
proximity_auth_client_(proximity_auth_client),
- unlock_manager_(
- new UnlockManagerImpl(screenlock_type, proximity_auth_client)),
clock_(new base::DefaultClock()),
pref_manager_(new ProximityAuthPrefManager(
proximity_auth_client->GetPrefService())),
+ unlock_manager_(new UnlockManagerImpl(screenlock_type,
+ proximity_auth_client_,
+ pref_manager_.get())),
suspended_(false),
started_(false),
weak_ptr_factory_(this) {}
@@ -44,9 +45,9 @@ ProximityAuthSystem::ProximityAuthSystem(
std::unique_ptr<ProximityAuthPrefManager> pref_manager)
: screenlock_type_(screenlock_type),
proximity_auth_client_(proximity_auth_client),
- unlock_manager_(std::move(unlock_manager)),
clock_(std::move(clock)),
pref_manager_(std::move(pref_manager)),
+ unlock_manager_(std::move(unlock_manager)),
suspended_(false),
started_(false),
weak_ptr_factory_(this) {}

Powered by Google App Engine
This is Rietveld 408576698