components/proximity_auth/cryptauth/cryptauth_device_manager.cc - Issue 1372283002: Hook up ProximityAuthSystem in EasyUnlockService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/proximity_auth/cryptauth/cryptauth_device_manager.cc

Issue 1372283002: Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection

Patch Set: remove log Created 5 years, 3 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 | « components/proximity_auth/cryptauth/cryptauth_device_manager.h ('k') | components/proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/proximity_auth/cryptauth/cryptauth_device_manager.cc

diff --git a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc

index bbb6c17a008eb3d774e0b29f1e75528e9b5ac37b..ecc0e5c71c464e286bf0079bf8523eba42b91791 100644

--- a/components/proximity_auth/cryptauth/cryptauth_device_manager.cc

+++ b/components/proximity_auth/cryptauth/cryptauth_device_manager.cc

@@ -94,7 +94,9 @@ CryptAuthDeviceManager::CryptAuthDeviceManager(

client_factory_(client_factory.Pass()),

gcm_manager_(gcm_manager),

pref_service_(pref_service),

- weak_ptr_factory_(this) {}

+ weak_ptr_factory_(this) {

+ UpdateUnlockKeysFromPrefs();

CryptAuthDeviceManager::~CryptAuthDeviceManager() {

gcm_manager_->RemoveObserver(this);

@@ -112,8 +114,6 @@ void CryptAuthDeviceManager::RegisterPrefs(PrefRegistrySimple* registry) {

}

void CryptAuthDeviceManager::Start() {

- UpdateUnlockKeysFromPrefs();

gcm_manager_->AddObserver(this);

base::Time last_successful_sync = GetLastSyncTime();