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

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: Pin warnings moved inside pin keyboard. 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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD}, 866 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
867 {"passwordPromptInvalidPassword", 867 {"passwordPromptInvalidPassword",
868 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD}, 868 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_INVALID_PASSWORD},
869 {"passwordPromptPasswordLabel", 869 {"passwordPromptPasswordLabel",
870 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL}, 870 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_PASSWORD_LABEL},
871 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE}, 871 {"passwordPromptTitle", IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_TITLE},
872 {"pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN}, 872 {"pinKeyboardPlaceholderPin", IDS_PIN_KEYBOARD_HINT_TEXT_PIN},
873 {"pinKeyboardPlaceholderPinPassword", 873 {"pinKeyboardPlaceholderPinPassword",
874 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD}, 874 IDS_PIN_KEYBOARD_HINT_TEXT_PIN_PASSWORD},
875 {"pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR}, 875 {"pinKeyboardClear", IDS_PIN_KEYBOARD_CLEAR},
876 {"pinKeyboardErrorMessage", IDS_PIN_KEYBOARD_ERROR_MESSAGE},
jdufault 2016/08/22 20:56:40 Remove this after the change above.
sammiequon 2016/08/23 17:30:18 Done.
876 {"changePictureTitle", IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TITLE}, 877 {"changePictureTitle", IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TITLE},
877 {"changePicturePageDescription", IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT}, 878 {"changePicturePageDescription", IDS_SETTINGS_CHANGE_PICTURE_DIALOG_TEXT},
878 {"takePhoto", IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO}, 879 {"takePhoto", IDS_SETTINGS_CHANGE_PICTURE_TAKE_PHOTO},
879 {"discardPhoto", IDS_SETTINGS_CHANGE_PICTURE_DISCARD_PHOTO}, 880 {"discardPhoto", IDS_SETTINGS_CHANGE_PICTURE_DISCARD_PHOTO},
880 {"flipPhoto", IDS_SETTINGS_CHANGE_PICTURE_FLIP_PHOTO}, 881 {"flipPhoto", IDS_SETTINGS_CHANGE_PICTURE_FLIP_PHOTO},
881 {"chooseFile", IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE}, 882 {"chooseFile", IDS_SETTINGS_CHANGE_PICTURE_CHOOSE_FILE},
882 {"profilePhoto", IDS_SETTINGS_CHANGE_PICTURE_PROFILE_PHOTO}, 883 {"profilePhoto", IDS_SETTINGS_CHANGE_PICTURE_PROFILE_PHOTO},
883 {"oldPhoto", IDS_SETTINGS_CHANGE_PICTURE_OLD_PHOTO}, 884 {"oldPhoto", IDS_SETTINGS_CHANGE_PICTURE_OLD_PHOTO},
884 {"profilePhotoLoading", IDS_SETTINGS_CHANGE_PICTURE_PROFILE_LOADING_PHOTO}, 885 {"profilePhotoLoading", IDS_SETTINGS_CHANGE_PICTURE_PROFILE_LOADING_PHOTO},
885 {"previewAltText", IDS_SETTINGS_CHANGE_PICTURE_PREVIEW_ALT}, 886 {"previewAltText", IDS_SETTINGS_CHANGE_PICTURE_PREVIEW_ALT},
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 #endif 1425 #endif
1425 AddUsersStrings(html_source); 1426 AddUsersStrings(html_source);
1426 AddWebContentStrings(html_source); 1427 AddWebContentStrings(html_source);
1427 1428
1428 policy_indicator::AddLocalizedStrings(html_source); 1429 policy_indicator::AddLocalizedStrings(html_source);
1429 1430
1430 html_source->SetJsonPath(kLocalizedStringsFile); 1431 html_source->SetJsonPath(kLocalizedStringsFile);
1431 } 1432 }
1432 1433
1433 } // namespace settings 1434 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698