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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Modified the flags. Created 3 years, 11 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 unified diff | Download patch
OLDNEW
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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 { "configurePinChoosePinTitle", 511 { "configurePinChoosePinTitle",
512 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE }, 512 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE },
513 { "configurePinConfirmPinTitle", 513 { "configurePinConfirmPinTitle",
514 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE }, 514 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE },
515 { "configurePinContinueButton", 515 { "configurePinContinueButton",
516 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON }, 516 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON },
517 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED }, 517 { "configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED },
518 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} , 518 { "configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT} ,
519 { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} , 519 { "configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG} ,
520 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN }, 520 { "configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN },
521 { "lockScreenAddFingerprint",
522 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
523 { "lockScreenCannotAddFingerprint",
524 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT},
521 { "lockScreenChangePinButton", 525 { "lockScreenChangePinButton",
522 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 526 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
527 { "lockScreenFingerprintEnable",
528 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
529 { "lockScreenFingerprintNewName",
530 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
531 { "lockScreenFingerprintWarning",
532 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
523 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, 533 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE },
524 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, 534 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY },
525 { "lockScreenPinOrPassword", 535 { "lockScreenPinOrPassword",
526 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, 536 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD },
537 { "lockScreenRegisteredFingerprints",
538 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
527 { "lockScreenSetupPinButton", 539 { "lockScreenSetupPinButton",
528 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, 540 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON },
529 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE }, 541 { "lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE },
530 { "passwordPromptEnterPassword", 542 { "passwordPromptEnterPassword",
531 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD }, 543 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD },
532 { "passwordPromptInvalidPassword", 544 { "passwordPromptInvalidPassword",
533 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD }, 545 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD },
534 { "passwordPromptPasswordLabel", 546 { "passwordPromptPasswordLabel",
535 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL }, 547 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL },
536 { "passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE }, 548 { "passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE },
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698