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

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

Issue 2222583002: Lock screen pin keyboard ui upgrades. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fixed patch set 3 errors. Created 4 years, 4 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 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 LocalizedString localized_strings[] = { 840 LocalizedString localized_strings[] = {
841 {"peoplePageTitle", IDS_SETTINGS_PEOPLE}, 841 {"peoplePageTitle", IDS_SETTINGS_PEOPLE},
842 {"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE}, 842 {"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE},
843 {"manageSupervisedUsers", IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS}, 843 {"manageSupervisedUsers", IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS},
844 #if defined(OS_CHROMEOS) 844 #if defined(OS_CHROMEOS)
845 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK}, 845 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK},
846 {"pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN}, 846 {"pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN},
847 {"pinKeyboardPlaceholderPinPassword", 847 {"pinKeyboardPlaceholderPinPassword",
848 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD}, 848 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD},
849 {"pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR}, 849 {"pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR},
850 {"pinKeyboardErrorMessage", IDS_PIN_KEYBOARD_ERROR_MESSAGE},
850 {"quickUnlockTitle", IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_TITLE}, 851 {"quickUnlockTitle", IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_TITLE},
851 {"quickUnlockConfirmLogin", IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIRM_LOGIN}, 852 {"quickUnlockConfirmLogin", IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CONFIRM_LOGIN},
852 {"quickUnlockPasswordLabel", 853 {"quickUnlockPasswordLabel",
853 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_PASSWORD_LABEL}, 854 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_PASSWORD_LABEL},
854 {"quickUnlockInvalidPassword", 855 {"quickUnlockInvalidPassword",
855 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_INVALID_PASSWORD}, 856 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_INVALID_PASSWORD},
856 {"quickUnlockChooseUnlockMethod", 857 {"quickUnlockChooseUnlockMethod",
857 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CHOOSE_UNLOCK_METHOD}, 858 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_CHOOSE_UNLOCK_METHOD},
858 {"quickUnlockUnlockMethodPassword", 859 {"quickUnlockUnlockMethodPassword",
859 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PASSWORD}, 860 IDS_SETTINGS_PEOPLE_QUICK_UNLOCK_UNLOCK_METHOD_PASSWORD},
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 #endif 1427 #endif
1427 AddUsersStrings(html_source); 1428 AddUsersStrings(html_source);
1428 AddWebContentStrings(html_source); 1429 AddWebContentStrings(html_source);
1429 1430
1430 policy_indicator::AddLocalizedStrings(html_source); 1431 policy_indicator::AddLocalizedStrings(html_source);
1431 1432
1432 html_source->SetJsonPath(kLocalizedStringsFile); 1433 html_source->SetJsonPath(kLocalizedStringsFile);
1433 } 1434 }
1434 1435
1435 } // namespace settings 1436 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698