OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 { "configurePinChoosePinTitle", | 512 { "configurePinChoosePinTitle", |
513 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE }, | 513 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE }, |
514 { "configurePinConfirmPinTitle", | 514 { "configurePinConfirmPinTitle", |
515 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE }, | 515 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE }, |
516 { "configurePinContinueButton", | 516 { "configurePinContinueButton", |
517 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON }, | 517 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON }, |
518 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED }, | 518 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED }, |
519 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} , | 519 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} , |
520 { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} , | 520 { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} , |
521 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN }, | 521 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN }, |
| 522 { "lockScreenAddFingerprint", |
| 523 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON}, |
| 524 { "lockScreenCannotAddFingerprint", |
| 525 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT}, |
522 { "lockScreenChangePinButton", | 526 { "lockScreenChangePinButton", |
523 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, | 527 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, |
| 528 { "lockScreenFingerprintEnable", |
| 529 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, |
| 530 { "lockScreenFingerprintNewName", |
| 531 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, |
| 532 { "lockScreenFingerprintWarning", |
| 533 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, |
524 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, | 534 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, |
525 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, | 535 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, |
526 { "lockScreenPinOrPassword", | 536 { "lockScreenPinOrPassword", |
527 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, | 537 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, |
| 538 { "lockScreenRegisteredFingerprints", |
| 539 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, |
528 { "lockScreenSetupPinButton", | 540 { "lockScreenSetupPinButton", |
529 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, | 541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, |
530 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE }, | 542 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE }, |
531 { "passwordPromptEnterPassword", | 543 { "passwordPromptEnterPassword", |
532 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD }, | 544 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD }, |
533 { "passwordPromptInvalidPassword", | 545 { "passwordPromptInvalidPassword", |
534 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD }, | 546 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD }, |
535 { "passwordPromptPasswordLabel", | 547 { "passwordPromptPasswordLabel", |
536 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL }, | 548 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL }, |
537 { "passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE }, | 549 { "passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE }, |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 base::CommandLine::ForCurrentProcess()->HasSwitch( | 775 base::CommandLine::ForCurrentProcess()->HasSwitch( |
764 chromeos::switches::kEnableExperimentalAccessibilityFeatures)); | 776 chromeos::switches::kEnableExperimentalAccessibilityFeatures)); |
765 | 777 |
766 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get(); | 778 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get(); |
767 bool allow_bluetooth = true; | 779 bool allow_bluetooth = true; |
768 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth); | 780 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth); |
769 values->SetBoolean("allowBluetooth", allow_bluetooth); | 781 values->SetBoolean("allowBluetooth", allow_bluetooth); |
770 | 782 |
771 values->SetBoolean("showQuickUnlockSettings", | 783 values->SetBoolean("showQuickUnlockSettings", |
772 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); | 784 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); |
| 785 values->SetBoolean("fingerprintUnlockEnabled", |
| 786 chromeos::IsFingerprintUnlockEnabled()); |
773 if (chromeos::IsPinUnlockEnabled(profile->GetPrefs())) { | 787 if (chromeos::IsPinUnlockEnabled(profile->GetPrefs())) { |
774 values->SetString( | 788 values->SetString( |
775 "enableScreenlock", | 789 "enableScreenlock", |
776 l10n_util::GetStringUTF16( | 790 l10n_util::GetStringUTF16( |
777 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK)); | 791 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK)); |
778 } else { | 792 } else { |
779 values->SetString( | 793 values->SetString( |
780 "enableScreenlock", | 794 "enableScreenlock", |
781 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); | 795 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); |
782 } | 796 } |
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2301 | 2315 |
2302 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { | 2316 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { |
2303 #if defined(OS_CHROMEOS) | 2317 #if defined(OS_CHROMEOS) |
2304 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); | 2318 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); |
2305 #else | 2319 #else |
2306 return true; | 2320 return true; |
2307 #endif | 2321 #endif |
2308 } | 2322 } |
2309 | 2323 |
2310 } // namespace options | 2324 } // namespace options |
OLD | NEW |