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

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

Issue 2376293005: cros: Tweaked the good/bad pin checking on the js to use the new quick unlock api function. (Closed)
Patch Set: Fixed patch set 12 errors. Created 3 years, 11 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 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS_DESCRIPTION}, 1061 IDS_SETTINGS_PEOPLE_MANAGE_SUPERVISED_USERS_DESCRIPTION},
1062 #if defined(OS_CHROMEOS) 1062 #if defined(OS_CHROMEOS)
1063 {"configurePinChoosePinTitle", 1063 {"configurePinChoosePinTitle",
1064 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE}, 1064 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CHOOSE_PIN_TITLE},
1065 {"configurePinConfirmPinTitle", 1065 {"configurePinConfirmPinTitle",
1066 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE}, 1066 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONFIRM_PIN_TITLE},
1067 {"configurePinContinueButton", 1067 {"configurePinContinueButton",
1068 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON}, 1068 IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_CONTINUE_BUTTON},
1069 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED}, 1069 {"configurePinMismatched", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_MISMATCHED},
1070 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT}, 1070 {"configurePinTooShort", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_SHORT},
1071 {"configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG},
1071 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN}, 1072 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
1072 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK}, 1073 {"enableScreenlock", IDS_SETTINGS_PEOPLE_ENABLE_SCREENLOCK},
1073 {"lockScreenChangePinButton", 1074 {"lockScreenChangePinButton",
1074 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 1075 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
1075 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 1076 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
1076 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 1077 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
1077 {"lockScreenPinOrPassword", 1078 {"lockScreenPinOrPassword",
1078 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 1079 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
1079 {"lockScreenSetupPinButton", 1080 {"lockScreenSetupPinButton",
1080 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 1081 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 #if defined(USE_NSS_CERTS) 1858 #if defined(USE_NSS_CERTS)
1858 AddCertificateManagerStrings(html_source); 1859 AddCertificateManagerStrings(html_source);
1859 #endif 1860 #endif
1860 1861
1861 policy_indicator::AddLocalizedStrings(html_source); 1862 policy_indicator::AddLocalizedStrings(html_source);
1862 1863
1863 html_source->SetJsonPath(kLocalizedStringsFile); 1864 html_source->SetJsonPath(kLocalizedStringsFile);
1864 } 1865 }
1865 1866
1866 } // namespace settings 1867 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698