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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2538303002: md-settings: Added settings for fingerprint unlock. (Closed)
Patch Set: Fixed patch set 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 {"configurePinChoosePinTitle", 1057 {"configurePinChoosePinTitle",
1058 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE}, 1058 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE},
1059 {"configurePinConfirmPinTitle", 1059 {"configurePinConfirmPinTitle",
1060 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE}, 1060 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE},
1061 {"configurePinContinueButton", 1061 {"configurePinContinueButton",
1062 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON}, 1062 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON},
1063 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED}, 1063 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED},
1064 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT}, 1064 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT},
1065 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN}, 1065 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
1066 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK}, 1066 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK},
1067 {"lockScreenAddFingerprint",
1068 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
1069 {"lockScreenCannotAddFingerprint",
1070 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT},
1067 {"lockScreenChangePinButton", 1071 {"lockScreenChangePinButton",
1068 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 1072 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
1069 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 1073 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
1074 {"lockScreenFingerprintEnable",
1075 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
1076 {"lockScreenFingerprintNewName",
1077 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
1078 {"lockScreenFingerprintWarning",
1079 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
1070 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 1080 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
1071 {"lockScreenPinOrPassword", 1081 {"lockScreenPinOrPassword",
1072 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 1082 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
1083 {"lockScreenRegisteredFingerprints",
1084 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
1073 {"lockScreenSetupPinButton", 1085 {"lockScreenSetupPinButton",
1074 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 1086 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
1075 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 1087 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
1076 {"passwordPromptEnterPassword", 1088 {"passwordPromptEnterPassword",
1077 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD}, 1089 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
1078 {"passwordPromptInvalidPassword", 1090 {"passwordPromptInvalidPassword",
1079 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD}, 1091 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD},
1080 {"passwordPromptPasswordLabel", 1092 {"passwordPromptPasswordLabel",
1081 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL}, 1093 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL},
1082 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE}, 1094 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE},
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 #if defined(USE_NSS_CERTS) 1858 #if defined(USE_NSS_CERTS)
1847 AddCertificateManagerStrings(html_source); 1859 AddCertificateManagerStrings(html_source);
1848 #endif 1860 #endif
1849 1861
1850 policy_indicator::AddLocalizedStrings(html_source); 1862 policy_indicator::AddLocalizedStrings(html_source);
1851 1863
1852 html_source->SetJsonPath(kLocalizedStringsFile); 1864 html_source->SetJsonPath(kLocalizedStringsFile);
1853 } 1865 }
1854 1866
1855 } // namespace settings 1867 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698