chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.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

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 321df72e984ba23e516b2d74f8fe5e2aa5fcc103..219d3589744cc041030a7815af54e36e1c86a648 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -252,6 +252,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {

{ "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },

{ "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION,

device_type_resource_id },

+ { "easyUnlockRequireProximityLabel",

+ IDS_OPTIONS_EASY_UNLOCK_REQUIRE_PROXIMITY_LABEL,

+ device_type_resource_id },

{ "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE },

{ "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },

{ "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO,

« chrome/app/generated_resources.grd ('K') | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »