| 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 3490fe533c87e63d932622dfeca69f3d4ffcb867..5f9557a8d341e523b507c51af0ea815ba230674c 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -518,12 +518,24 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} ,
|
| { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} ,
|
| { "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 },
|
| @@ -769,6 +781,8 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
|
|
| values->SetBoolean("showQuickUnlockSettings",
|
| chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
|
| + values->SetBoolean("fingerprintUnlockEnabled",
|
| + chromeos::IsFingerprintUnlockEnabled());
|
| if (chromeos::IsPinUnlockEnabled(profile->GetPrefs())) {
|
| values->SetString(
|
| "enableScreenlock",
|
|
|