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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/settings_resources.grd

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/privacy_page/privacy_page.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/settings_resources.grd
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index a1b0c039b19e98aec60c2af3427c1ba2a661b175..c0eba2d67e0b231f7e0d76240f38a17f5993d63a 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -161,51 +161,53 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
file="settings_ui/settings_ui.js"
type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS"
- file="certificate_manager_page/certificate_manager_page.css"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
- file="certificate_manager_page/certificate_manager_page.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS"
- file="certificate_manager_page/certificate_manager_page.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML"
- file="certificate_manager_page/certificates_browser_proxy.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS"
- file="certificate_manager_page/certificates_browser_proxy.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS"
- file="certificate_manager_page/ca_trust_edit_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML"
- file="certificate_manager_page/ca_trust_edit_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
- file="certificate_manager_page/certificate_delete_confirmation_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTML"
- file="certificate_manager_page/certificate_delete_confirmation_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
- file="certificate_manager_page/certificate_password_encryption_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTML"
- file="certificate_manager_page/certificate_password_encryption_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
- file="certificate_manager_page/certificate_password_decryption_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTML"
- file="certificate_manager_page/certificate_password_decryption_dialog.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS"
- file="certificate_manager_page/certificates_error_dialog.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML"
- file="certificate_manager_page/certificates_error_dialog.html"
- type="chrome_html" />
+ <if expr="use_nss_certs">
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS"
+ file="certificate_manager_page/certificate_manager_page.css"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
+ file="certificate_manager_page/certificate_manager_page.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS"
+ file="certificate_manager_page/certificate_manager_page.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML"
+ file="certificate_manager_page/certificates_browser_proxy.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS"
+ file="certificate_manager_page/certificates_browser_proxy.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS"
+ file="certificate_manager_page/ca_trust_edit_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML"
+ file="certificate_manager_page/ca_trust_edit_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
+ file="certificate_manager_page/certificate_delete_confirmation_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_delete_confirmation_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
+ file="certificate_manager_page/certificate_password_encryption_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_password_encryption_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
+ file="certificate_manager_page/certificate_password_decryption_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTML"
+ file="certificate_manager_page/certificate_password_decryption_dialog.html"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS"
+ file="certificate_manager_page/certificates_error_dialog.js"
+ type="chrome_html" />
+ <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML"
+ file="certificate_manager_page/certificates_error_dialog.html"
+ type="chrome_html" />
+ </if>
<structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HTML"
file="clear_browsing_data_dialog/clear_browsing_data_dialog.html"
type="chrome_html" />
@@ -463,6 +465,7 @@
allowexternalscript="true" />
<structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"
file="privacy_page/privacy_page.js"
+ flattenhtml="true"
type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"
file="settings_page/settings_router.html"
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698