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

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

Issue 1831093002: MD Settings: Certificate manager, respect USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ifdef to JS file. Created 4 years, 8 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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 {"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE}, 190 {"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE},
191 {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY}, 191 {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY},
192 {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY}, 192 {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
193 {"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY}, 193 {"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY},
194 }; 194 };
195 AddLocalizedStringsBulk(html_source, localized_strings, 195 AddLocalizedStringsBulk(html_source, localized_strings,
196 arraysize(localized_strings)); 196 arraysize(localized_strings));
197 } 197 }
198 #endif 198 #endif
199 199
200 #if defined(USE_NSS_CERTS)
200 void AddCertificateManagerStrings(content::WebUIDataSource* html_source) { 201 void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
201 LocalizedString localized_strings[] = { 202 LocalizedString localized_strings[] = {
202 {"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER}, 203 {"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER},
203 {"certificateManagerYourCertificates", 204 {"certificateManagerYourCertificates",
204 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES}, 205 IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES},
205 {"certificateManagerYourCertificatesSubtitle", 206 {"certificateManagerYourCertificatesSubtitle",
206 IDS_SETTINGS_CERTIFICATE_MANAGER_YOU_HAVE_CERTIFICATES}, 207 IDS_SETTINGS_CERTIFICATE_MANAGER_YOU_HAVE_CERTIFICATES},
207 {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS}, 208 {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS},
208 {"certificateManagerServersSubtitle", 209 {"certificateManagerServersSubtitle",
209 IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_IDENTIFY}, 210 IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_IDENTIFY},
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 {"certificateManagerPassword", 260 {"certificateManagerPassword",
260 IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD}, 261 IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD},
261 {"certificateManagerConfirmPassword", 262 {"certificateManagerConfirmPassword",
262 IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD}, 263 IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD},
263 {"certificateImportErrorFormat", 264 {"certificateImportErrorFormat",
264 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT}, 265 IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT},
265 }; 266 };
266 AddLocalizedStringsBulk(html_source, localized_strings, 267 AddLocalizedStringsBulk(html_source, localized_strings,
267 arraysize(localized_strings)); 268 arraysize(localized_strings));
268 } 269 }
270 #endif
269 271
270 void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) { 272 void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {
271 LocalizedString localized_strings[] = { 273 LocalizedString localized_strings[] = {
272 {"clearFollowingItemsFrom", IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM}, 274 {"clearFollowingItemsFrom", IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM},
273 {"clearBrowsingHistory", IDS_SETTINGS_CLEAR_BROWSING_HISTORY}, 275 {"clearBrowsingHistory", IDS_SETTINGS_CLEAR_BROWSING_HISTORY},
274 {"clearDownloadHistory", IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY}, 276 {"clearDownloadHistory", IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY},
275 {"clearCache", IDS_SETTINGS_CLEAR_CACHE}, 277 {"clearCache", IDS_SETTINGS_CLEAR_CACHE},
276 {"clearCookies", IDS_SETTINGS_CLEAR_COOKIES}, 278 {"clearCookies", IDS_SETTINGS_CLEAR_COOKIES},
277 {"clearCookiesFlash", IDS_SETTINGS_CLEAR_COOKIES_FLASH}, 279 {"clearCookiesFlash", IDS_SETTINGS_CLEAR_COOKIES_FLASH},
278 {"clearPasswords", IDS_SETTINGS_CLEAR_PASSWORDS}, 280 {"clearPasswords", IDS_SETTINGS_CLEAR_PASSWORDS},
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 861
860 AddA11yStrings(html_source); 862 AddA11yStrings(html_source);
861 AddAboutStrings(html_source); 863 AddAboutStrings(html_source);
862 #if defined(OS_CHROMEOS) 864 #if defined(OS_CHROMEOS)
863 AddAccountUITweaksStrings(html_source, profile); 865 AddAccountUITweaksStrings(html_source, profile);
864 #endif 866 #endif
865 AddAppearanceStrings(html_source); 867 AddAppearanceStrings(html_source);
866 #if defined(OS_CHROMEOS) 868 #if defined(OS_CHROMEOS)
867 AddBluetoothStrings(html_source); 869 AddBluetoothStrings(html_source);
868 #endif 870 #endif
871 #if defined(USE_NSS_CERTS)
869 AddCertificateManagerStrings(html_source); 872 AddCertificateManagerStrings(html_source);
873 #endif
870 AddClearBrowsingDataStrings(html_source); 874 AddClearBrowsingDataStrings(html_source);
871 AddCloudPrintStrings(html_source); 875 AddCloudPrintStrings(html_source);
872 #if !defined(OS_CHROMEOS) 876 #if !defined(OS_CHROMEOS)
873 AddDefaultBrowserStrings(html_source); 877 AddDefaultBrowserStrings(html_source);
874 #endif 878 #endif
875 AddDateTimeStrings(html_source); 879 AddDateTimeStrings(html_source);
876 #if defined(OS_CHROMEOS) 880 #if defined(OS_CHROMEOS)
877 AddDeviceStrings(html_source); 881 AddDeviceStrings(html_source);
878 #endif 882 #endif
879 AddDownloadsStrings(html_source); 883 AddDownloadsStrings(html_source);
(...skipping 20 matching lines...) Expand all
900 #endif 904 #endif
901 AddUsersStrings(html_source); 905 AddUsersStrings(html_source);
902 AddWebContentStrings(html_source); 906 AddWebContentStrings(html_source);
903 907
904 policy_indicator::AddLocalizedStrings(html_source); 908 policy_indicator::AddLocalizedStrings(html_source);
905 909
906 html_source->SetJsonPath(kLocalizedStringsFile); 910 html_source->SetJsonPath(kLocalizedStringsFile);
907 } 911 }
908 912
909 } // namespace settings 913 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/test/data/webui/settings/cr_settings_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698