chrome/browser/signin/easy_unlock_service.cc - Issue 2973243002: Adding pref to store the user-selected proximity threshold.

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: chrome/browser/signin/easy_unlock_service.cc

Issue 2973243002: Adding pref to store the user-selected proximity threshold. (Closed)

Patch Set: Fixing merge 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:

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 157ac8cd25eb8565f39bd84cb8cf757b224739d9..1137cc55b83129373b8dbea2ddbfe33d05eb2cdd 100644

--- a/chrome/browser/signin/easy_unlock_service.cc

+++ b/chrome/browser/signin/easy_unlock_service.cc

@@ -254,9 +254,7 @@ void EasyUnlockService::RegisterProfilePrefs(

registry->RegisterDictionaryPref(prefs::kEasyUnlockPairing,

base::MakeUnique<base::DictionaryValue>());

- if (base::CommandLine::ForCurrentProcess()->HasSwitch(

- proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))

- proximity_auth::ProximityAuthPrefManager::RegisterPrefs(registry);

+ proximity_auth::ProximityAuthPrefManager::RegisterPrefs(registry);

}

// static

« no previous file with comments | « no previous file | chrome/browser/signin/easy_unlock_service_regular.cc » ('j') | no next file with comments »