Chromium Code Reviews| 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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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", | 522 { "lockScreenAddFingerprint", |
| 523 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON}, | 523 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON}, |
| 524 { "lockScreenCannotAddFingerprint", | 524 { "lockScreenCannotAddFingerprint", |
| 525 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT}, | 525 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT}, |
| 526 { "lockScreenChangePinButton", | 526 { "lockScreenChangePinButton", |
| 527 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, | 527 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, |
| 528 { "lockScreenEditFingerprint", | |
| 529 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_LABEL}, | |
| 530 { "lockScreenEditFingerprintSecondary", | |
| 531 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_SUBLABEL}, | |
|
stevenjb
2017/02/03 18:10:13
These strings are for the old "options" UI, you ne
sammiequon
2017/02/03 18:52:54
I added to md_settings_localized_strings_provider.
stevenjb
2017/02/03 18:56:17
Ah, OK, I didn't realize this was also embedded in
| |
| 528 { "lockScreenFingerprintEnable", | 532 { "lockScreenFingerprintEnable", |
| 529 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, | 533 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, |
| 530 { "lockScreenFingerprintNewName", | 534 { "lockScreenFingerprintNewName", |
| 531 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, | 535 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, |
| 536 { "lockScreenFingerprintTitle", | |
| 537 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, | |
| 532 { "lockScreenFingerprintWarning", | 538 { "lockScreenFingerprintWarning", |
| 533 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, | 539 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, |
| 534 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, | 540 { "lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE }, |
| 535 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, | 541 { "lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY }, |
| 536 { "lockScreenPinOrPassword", | 542 { "lockScreenPinOrPassword", |
| 537 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, | 543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD }, |
| 538 { "lockScreenRegisteredFingerprints", | 544 { "lockScreenRegisteredFingerprints", |
| 539 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, | 545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, |
| 540 { "lockScreenSetupPinButton", | 546 { "lockScreenSetupPinButton", |
| 541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, | 547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON }, |
| (...skipping 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2315 | 2321 |
| 2316 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { | 2322 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { |
| 2317 #if defined(OS_CHROMEOS) | 2323 #if defined(OS_CHROMEOS) |
| 2318 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); | 2324 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); |
| 2319 #else | 2325 #else |
| 2320 return true; | 2326 return true; |
| 2321 #endif | 2327 #endif |
| 2322 } | 2328 } |
| 2323 | 2329 |
| 2324 } // namespace options | 2330 } // namespace options |
| OLD | NEW |