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

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: Rebased. Created 3 years, 10 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 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 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE}, 1089 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE},
1090 {"configurePinConfirmPinTitle", 1090 {"configurePinConfirmPinTitle",
1091 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE}, 1091 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE},
1092 {"configurePinContinueButton", 1092 {"configurePinContinueButton",
1093 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON}, 1093 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON},
1094 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED}, 1094 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED},
1095 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT}, 1095 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT},
1096 {"configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG}, 1096 {"configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG},
1097 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN}, 1097 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
1098 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK}, 1098 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK},
1099 {"lockScreenAddFingerprint",
1100 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
1101 {"lockScreenCannotAddFingerprint",
1102 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT},
1099 {"lockScreenChangePinButton", 1103 {"lockScreenChangePinButton",
1100 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 1104 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
1101 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 1105 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
1106 {"lockScreenFingerprintEnable",
1107 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
1108 {"lockScreenFingerprintNewName",
1109 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
1110 {"lockScreenFingerprintWarning",
1111 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
1102 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 1112 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
1103 {"lockScreenPinOrPassword", 1113 {"lockScreenPinOrPassword",
1104 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 1114 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
1115 {"lockScreenRegisteredFingerprints",
1116 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
1105 {"lockScreenSetupPinButton", 1117 {"lockScreenSetupPinButton",
1106 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 1118 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
1107 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 1119 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
1108 {"passwordPromptEnterPassword", 1120 {"passwordPromptEnterPassword",
1109 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD}, 1121 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
1110 {"passwordPromptInvalidPassword", 1122 {"passwordPromptInvalidPassword",
1111 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD}, 1123 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD},
1112 {"passwordPromptPasswordLabel", 1124 {"passwordPromptPasswordLabel",
1113 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL}, 1125 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL},
1114 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE}, 1126 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE},
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1869 1881
1870 #if defined(OS_CHROMEOS) 1882 #if defined(OS_CHROMEOS)
1871 chromeos::network_element::AddLocalizedStrings(html_source); 1883 chromeos::network_element::AddLocalizedStrings(html_source);
1872 #endif 1884 #endif
1873 policy_indicator::AddLocalizedStrings(html_source); 1885 policy_indicator::AddLocalizedStrings(html_source);
1874 1886
1875 html_source->SetJsonPath(kLocalizedStringsFile); 1887 html_source->SetJsonPath(kLocalizedStringsFile);
1876 } 1888 }
1877 1889
1878 } // namespace settings 1890 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698