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

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

Issue 2676763002: MD Settings: Put fingerprints on its own subpage. (Closed)
Patch Set: Fixed patch set 1 errors. 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
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
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", 1099 {"lockScreenAddFingerprint",
1100 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON}, 1100 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
1101 {"lockScreenCannotAddFingerprint", 1101 {"lockScreenCannotAddFingerprint",
1102 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT}, 1102 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CANNOT_ADD_NEW_FINGERPRINT},
1103 {"lockScreenChangePinButton", 1103 {"lockScreenChangePinButton",
1104 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 1104 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
1105 {"lockScreenEditFingerprints",
1106 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS},
1107 {"lockScreenEditFingerprintsDescription",
1108 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_DESCRIPTION},
1105 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 1109 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
1106 {"lockScreenFingerprintEnable", 1110 {"lockScreenFingerprintEnable",
1107 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 1111 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
1108 {"lockScreenFingerprintNewName", 1112 {"lockScreenFingerprintNewName",
1109 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 1113 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
1114 {"lockScreenFingerprintTitle",
1115 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
1110 {"lockScreenFingerprintWarning", 1116 {"lockScreenFingerprintWarning",
1111 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 1117 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
1112 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 1118 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
1113 {"lockScreenPinOrPassword", 1119 {"lockScreenPinOrPassword",
1114 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 1120 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
1115 {"lockScreenRegisteredFingerprints", 1121 {"lockScreenRegisteredFingerprints",
1116 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 1122 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
1117 {"lockScreenSetupPinButton", 1123 {"lockScreenSetupPinButton",
1118 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 1124 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
1119 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 1125 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 1887
1882 #if defined(OS_CHROMEOS) 1888 #if defined(OS_CHROMEOS)
1883 chromeos::network_element::AddLocalizedStrings(html_source); 1889 chromeos::network_element::AddLocalizedStrings(html_source);
1884 #endif 1890 #endif
1885 policy_indicator::AddLocalizedStrings(html_source); 1891 policy_indicator::AddLocalizedStrings(html_source);
1886 1892
1887 html_source->SetJsonPath(kLocalizedStringsFile); 1893 html_source->SetJsonPath(kLocalizedStringsFile);
1888 } 1894 }
1889 1895
1890 } // namespace settings 1896 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698