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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 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
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/settings_resources.h" type="rc_header"> 4 <output filename="grit/settings_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/settings_resources_map.cc" 7 <output filename="grit/settings_resources_map.cc"
8 type="resource_file_map_source" /> 8 type="resource_file_map_source" />
9 <output filename="grit/settings_resources_map.h" 9 <output filename="grit/settings_resources_map.h"
10 type="resource_map_header" /> 10 type="resource_map_header" />
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 type="chrome_html" /> 154 type="chrome_html" />
155 <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_JS" 155 <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_JS"
156 file="settings_page/transition_behavior.js" 156 file="settings_page/transition_behavior.js"
157 type="chrome_html" /> 157 type="chrome_html" />
158 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML" 158 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"
159 file="settings_ui/settings_ui.html" 159 file="settings_ui/settings_ui.html"
160 type="chrome_html" /> 160 type="chrome_html" />
161 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS" 161 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
162 file="settings_ui/settings_ui.js" 162 file="settings_ui/settings_ui.js"
163 type="chrome_html" /> 163 type="chrome_html" />
164 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS" 164 <if expr="use_nss_certs">
165 file="certificate_manager_page/certificate_manager_page.css" 165 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_CSS"
166 type="chrome_html" /> 166 file="certificate_manager_page/certificate_manager_page.css"
167 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML" 167 type="chrome_html" />
168 file="certificate_manager_page/certificate_manager_page.html" 168 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
169 type="chrome_html" /> 169 file="certificate_manager_page/certificate_manager_page.html"
170 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS" 170 type="chrome_html" />
171 file="certificate_manager_page/certificate_manager_page.js" 171 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_JS"
172 type="chrome_html" /> 172 file="certificate_manager_page/certificate_manager_page.js"
173 <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML" 173 type="chrome_html" />
174 file="certificate_manager_page/certificates_browser_proxy.html" 174 <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_HTML"
175 type="chrome_html" /> 175 file="certificate_manager_page/certificates_browser_proxy.htm l"
176 <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS" 176 type="chrome_html" />
177 file="certificate_manager_page/certificates_browser_proxy.js" 177 <structure name="IDR_SETTINGS_CERTIFICATES_BROWSER_PROXY_JS"
178 type="chrome_html" /> 178 file="certificate_manager_page/certificates_browser_proxy.js"
179 <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS" 179 type="chrome_html" />
180 file="certificate_manager_page/ca_trust_edit_dialog.js" 180 <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_JS"
181 type="chrome_html" /> 181 file="certificate_manager_page/ca_trust_edit_dialog.js"
182 <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML" 182 type="chrome_html" />
183 file="certificate_manager_page/ca_trust_edit_dialog.html" 183 <structure name="IDR_SETTINGS_CA_TRUST_EDIT_DIALOG_HTML"
184 type="chrome_html" /> 184 file="certificate_manager_page/ca_trust_edit_dialog.html"
185 <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS" 185 type="chrome_html" />
186 file="certificate_manager_page/certificate_delete_confirmation_ dialog.js" 186 <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_JS"
187 type="chrome_html" /> 187 file="certificate_manager_page/certificate_delete_confirmatio n_dialog.js"
188 <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTML" 188 type="chrome_html" />
189 file="certificate_manager_page/certificate_delete_confirmation_ dialog.html" 189 <structure name="IDR_SETTINGS_CERTIFICATE_DELETE_CONFIRMATION_DIALOG_HTM L"
190 type="chrome_html" /> 190 file="certificate_manager_page/certificate_delete_confirmatio n_dialog.html"
191 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS" 191 type="chrome_html" />
192 file="certificate_manager_page/certificate_password_encryption_ dialog.js" 192 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_JS"
193 type="chrome_html" /> 193 file="certificate_manager_page/certificate_password_encryptio n_dialog.js"
194 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTML" 194 type="chrome_html" />
195 file="certificate_manager_page/certificate_password_encryption_ dialog.html" 195 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_ENCRYPTION_DIALOG_HTM L"
196 type="chrome_html" /> 196 file="certificate_manager_page/certificate_password_encryptio n_dialog.html"
197 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS" 197 type="chrome_html" />
198 file="certificate_manager_page/certificate_password_decryption_ dialog.js" 198 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_JS"
199 type="chrome_html" /> 199 file="certificate_manager_page/certificate_password_decryptio n_dialog.js"
200 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTML" 200 type="chrome_html" />
201 file="certificate_manager_page/certificate_password_decryption_ dialog.html" 201 <structure name="IDR_SETTINGS_CERTIFICATE_PASSWORD_DECRYPTION_DIALOG_HTM L"
202 type="chrome_html" /> 202 file="certificate_manager_page/certificate_password_decryptio n_dialog.html"
203 <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS" 203 type="chrome_html" />
204 file="certificate_manager_page/certificates_error_dialog.js" 204 <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_JS"
205 type="chrome_html" /> 205 file="certificate_manager_page/certificates_error_dialog.js"
206 <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML" 206 type="chrome_html" />
207 file="certificate_manager_page/certificates_error_dialog.html" 207 <structure name="IDR_SETTINGS_CERTIFICATES_ERROR_DIALOG_HTML"
208 type="chrome_html" /> 208 file="certificate_manager_page/certificates_error_dialog.html "
209 type="chrome_html" />
210 </if>
209 <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HTML" 211 <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HTML"
210 file="clear_browsing_data_dialog/clear_browsing_data_dialog.htm l" 212 file="clear_browsing_data_dialog/clear_browsing_data_dialog.htm l"
211 type="chrome_html" /> 213 type="chrome_html" />
212 <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_JS" 214 <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_JS"
213 file="clear_browsing_data_dialog/clear_browsing_data_dialog.js" 215 file="clear_browsing_data_dialog/clear_browsing_data_dialog.js"
214 type="chrome_html" /> 216 type="chrome_html" />
215 <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_HTML" 217 <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_HTML"
216 file="controls/settings_checkbox.html" 218 file="controls/settings_checkbox.html"
217 type="chrome_html" /> 219 type="chrome_html" />
218 <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_JS" 220 <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_JS"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 <structure name="IDR_SETTINGS_PRIVACY_PAGE_CSS" 458 <structure name="IDR_SETTINGS_PRIVACY_PAGE_CSS"
457 file="privacy_page/privacy_page.css" 459 file="privacy_page/privacy_page.css"
458 type="chrome_html" /> 460 type="chrome_html" />
459 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML" 461 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"
460 file="privacy_page/privacy_page.html" 462 file="privacy_page/privacy_page.html"
461 type="chrome_html" 463 type="chrome_html"
462 flattenhtml="true" 464 flattenhtml="true"
463 allowexternalscript="true" /> 465 allowexternalscript="true" />
464 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS" 466 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"
465 file="privacy_page/privacy_page.js" 467 file="privacy_page/privacy_page.js"
468 flattenhtml="true"
466 type="chrome_html" /> 469 type="chrome_html" />
467 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML" 470 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"
468 file="settings_page/settings_router.html" 471 file="settings_page/settings_router.html"
469 type="chrome_html" /> 472 type="chrome_html" />
470 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS" 473 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"
471 file="settings_page/settings_router.js" 474 file="settings_page/settings_router.js"
472 type="chrome_html" 475 type="chrome_html"
473 flattenhtml="true" 476 flattenhtml="true"
474 allowexternalscript="true" /> 477 allowexternalscript="true" />
475 <structure name="IDR_SETTINGS_SITE_LIST_CSS" 478 <structure name="IDR_SETTINGS_SITE_LIST_CSS"
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 type="chrome_html" 867 type="chrome_html"
865 flattenhtml="true" 868 flattenhtml="true"
866 allowexternalscript="true" /> 869 allowexternalscript="true" />
867 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 870 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
868 file="people_page/users_page.css" 871 file="people_page/users_page.css"
869 type="chrome_html" /> 872 type="chrome_html" />
870 </if> 873 </if>
871 </structures> 874 </structures>
872 </release> 875 </release>
873 </grit> 876 </grit>
OLDNEW
« 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