chrome/browser/signin/easy_unlock_service.cc - Issue 696583002: [Smart Lock] Add a setting to require close proximity in order for unlocking to work.

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 696583002: [Smart Lock] Add a setting to require close proximity in order for unlocking to work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« chrome/app/generated_resources.grd ('K') | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cb498dde31f460e99a80b82ac0978676f503cf75..497286368d05f7f5eaf92fcec2126fda941c74bc 100644

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

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

@@ -208,6 +208,10 @@ EasyUnlockService::~EasyUnlockService() {

void EasyUnlockService::RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable* registry) {

registry->RegisterBooleanPref(

+ prefs::kEasyUnlockAllowed,

+ true,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(

prefs::kEasyUnlockEnabled,

false,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

@@ -216,9 +220,9 @@ void EasyUnlockService::RegisterProfilePrefs(

new base::DictionaryValue(),

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

registry->RegisterBooleanPref(

- prefs::kEasyUnlockAllowed,

- true,

- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ prefs::kEasyUnlockProximityRequired,

+ false,

+ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

}

// static