| Index: components/proximity_auth/unlock_manager_impl.cc
|
| diff --git a/components/proximity_auth/unlock_manager_impl.cc b/components/proximity_auth/unlock_manager_impl.cc
|
| index 92afbacee4338f8f51a3897338f6f18cf1d18196..b326004d08ff7d805020db3314e0e3d834c948e5 100644
|
| --- a/components/proximity_auth/unlock_manager_impl.cc
|
| +++ b/components/proximity_auth/unlock_manager_impl.cc
|
| @@ -18,6 +18,7 @@
|
| #include "components/proximity_auth/messenger.h"
|
| #include "components/proximity_auth/metrics.h"
|
| #include "components/proximity_auth/proximity_auth_client.h"
|
| +#include "components/proximity_auth/proximity_auth_pref_manager.h"
|
| #include "components/proximity_auth/proximity_monitor_impl.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
|
|
| @@ -80,12 +81,16 @@ metrics::RemoteSecuritySettingsState GetRemoteSecuritySettingsState(
|
|
|
| } // namespace
|
|
|
| +class ProximityAuthPrefManager;
|
| +
|
| UnlockManagerImpl::UnlockManagerImpl(
|
| ProximityAuthSystem::ScreenlockType screenlock_type,
|
| - ProximityAuthClient* proximity_auth_client)
|
| + ProximityAuthClient* proximity_auth_client,
|
| + ProximityAuthPrefManager* pref_manager)
|
| : screenlock_type_(screenlock_type),
|
| life_cycle_(nullptr),
|
| proximity_auth_client_(proximity_auth_client),
|
| + pref_manager_(pref_manager),
|
| is_locked_(false),
|
| is_attempting_auth_(false),
|
| is_waking_up_(false),
|
| @@ -158,7 +163,8 @@ void UnlockManagerImpl::OnLifeCycleStateChanged() {
|
| if (state == RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED) {
|
| DCHECK(life_cycle_->GetConnection());
|
| DCHECK(GetMessenger());
|
| - proximity_monitor_ = CreateProximityMonitor(life_cycle_->GetConnection());
|
| + proximity_monitor_ =
|
| + CreateProximityMonitor(life_cycle_->GetConnection(), pref_manager_);
|
| GetMessenger()->AddObserver(this);
|
| }
|
|
|
| @@ -326,9 +332,10 @@ void UnlockManagerImpl::OnAuthAttempted(mojom::AuthType auth_type) {
|
| }
|
|
|
| std::unique_ptr<ProximityMonitor> UnlockManagerImpl::CreateProximityMonitor(
|
| - cryptauth::Connection* connection) {
|
| + cryptauth::Connection* connection,
|
| + ProximityAuthPrefManager* pref_manager) {
|
| return base::MakeUnique<ProximityMonitorImpl>(
|
| - connection, base::WrapUnique(new base::DefaultTickClock()));
|
| + connection, base::WrapUnique(new base::DefaultTickClock()), pref_manager);
|
| }
|
|
|
| void UnlockManagerImpl::SendSignInChallenge() {
|
|
|