Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 7 errors. Created 4 years 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 1a5aa8f3e509e3ea963ae016e8f15235028189d0..1ce09bcd46992204f502bfad37fe13ce920fd6ad 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -515,12 +515,24 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED },
{ "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} ,
{ "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN },
+ { "lockScreenAddFingerprint",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
+ { "lockScreenCannotAddFingerprint",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT},
{ "lockScreenChangePinButton",
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
+ { "lockScreenFingerprintEnable",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
+ { "lockScreenFingerprintNewName",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
+ { "lockScreenFingerprintWarning",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
{ "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE },
{ "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY },
{ "lockScreenPinOrPassword",
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD },
+ { "lockScreenRegisteredFingerprints",
+ IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
{ "lockScreenSetupPinButton",
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON },
{ "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE },
@@ -767,6 +779,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
values->SetBoolean("showQuickUnlockSettings",
chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
+ values->SetBoolean("fingerprintUnlockEnabled",
+ chromeos::IsFingerprintUnlockEnabled());
stevenjb 2016/12/07 23:25:40 Is this implemented in the options UI? I only see
sammiequon 2016/12/08 03:50:50 It's meant to be md-settings only, but it has to b
stevenjb 2016/12/08 16:49:41 Is this used in this CL? If so I missed it. If not
sammiequon 2016/12/08 20:22:40 Yes, lock_screen.html was added previously so this
stevenjb 2016/12/08 20:50:21 Could you go ahead and separate those changes from
sammiequon 2016/12/08 21:44:01 Hmmm, maybe I didn't explain properly in the previ
jdufault 2016/12/09 17:54:01 We should make sure this works in both options and
if (chromeos::IsPinUnlockEnabled(profile->GetPrefs())) {
values->SetString(
"enableScreenlock",

Powered by Google App Engine
This is Rietveld 408576698