chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 1831093002: MD Settings: Certificate manager, respect USE_NSS_CERTS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 9 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 side-by-side diff with in-line comments

Download patch

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

index e39adbd02664b8bc57eb4cb27ca91ef082df6b2a..34ad2a7558bba5f80eb3ef2c4957ebe191b2a165 100644

--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -197,6 +197,7 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {

}

#endif

+#if defined(USE_NSS_CERTS)

void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {

LocalizedString localized_strings[] = {

{"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER},

@@ -266,6 +267,7 @@ void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {

AddLocalizedStringsBulk(html_source, localized_strings,

arraysize(localized_strings));

}

+#endif

void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {

LocalizedString localized_strings[] = {

@@ -866,7 +868,9 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,

#if defined(OS_CHROMEOS)

AddBluetoothStrings(html_source);

#endif

+#if defined(USE_NSS_CERTS)

AddCertificateManagerStrings(html_source);

+#endif

AddClearBrowsingDataStrings(html_source);

AddCloudPrintStrings(html_source);

#if !defined(OS_CHROMEOS)