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

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

Issue 2889723004: [merge to m59]md settings: Remove level of security indicator on lock screen. (Closed)
Patch Set: Created 3 years, 7 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 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS}, 1234 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS},
1235 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 1235 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
1236 {"lockScreenFingerprintEnable", 1236 {"lockScreenFingerprintEnable",
1237 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 1237 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
1238 {"lockScreenFingerprintNewName", 1238 {"lockScreenFingerprintNewName",
1239 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 1239 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
1240 {"lockScreenFingerprintTitle", 1240 {"lockScreenFingerprintTitle",
1241 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, 1241 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
1242 {"lockScreenFingerprintWarning", 1242 {"lockScreenFingerprintWarning",
1243 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 1243 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
1244 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY},
1245 {"lockScreenMediumSecurity",
1246 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY},
1247 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 1244 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
1248 {"lockScreenPinOrPassword", 1245 {"lockScreenPinOrPassword",
1249 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 1246 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
1250 {"lockScreenRegisteredFingerprints", 1247 {"lockScreenRegisteredFingerprints",
1251 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 1248 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
1252 {"lockScreenSetupPinButton", 1249 {"lockScreenSetupPinButton",
1253 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 1250 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
1254 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 1251 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
1255 {"passwordPromptEnterPassword", 1252 {"passwordPromptEnterPassword",
1256 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD}, 1253 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 2042
2046 #if defined(OS_CHROMEOS) 2043 #if defined(OS_CHROMEOS)
2047 chromeos::network_element::AddLocalizedStrings(html_source); 2044 chromeos::network_element::AddLocalizedStrings(html_source);
2048 #endif 2045 #endif
2049 policy_indicator::AddLocalizedStrings(html_source); 2046 policy_indicator::AddLocalizedStrings(html_source);
2050 2047
2051 html_source->SetJsonPath(kLocalizedStringsFile); 2048 html_source->SetJsonPath(kLocalizedStringsFile);
2052 } 2049 }
2053 2050
2054 } // namespace settings 2051 } // 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