MD Settings: Certificate manager, populate UI.

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

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..a827bde83628bc8b790109ff7f530e80cbcf6ee1 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
@@ -202,19 +202,12 @@ void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
       {"certificateManagerPageTitle", IDS_SETTINGS_CERTIFICATE_MANAGER},
       {"certificateManagerYourCertificates",
        IDS_SETTINGS_CERTIFICATE_MANAGER_YOUR_CERTIFICATES},
-      {"certificateManagerYourCertificatesSubtitle",
-       IDS_SETTINGS_CERTIFICATE_MANAGER_YOU_HAVE_CERTIFICATES},
       {"certificateManagerServers", IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS},
-      {"certificateManagerServersSubtitle",
-       IDS_SETTINGS_CERTIFICATE_MANAGER_SERVERS_IDENTIFY},
       {"certificateManagerAuthorities",
        IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES},
-      {"certificateManagerAuthoritiesSubtitle",
-       IDS_SETTINGS_CERTIFICATE_MANAGER_AUTHORITIES_YOU_HAVE_AUTHORITIES},
       {"certificateManagerOthers", IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS},
-      {"certificateManagerOthersSubtitle",
-       IDS_SETTINGS_CERTIFICATE_MANAGER_OTHERS_YOU_HAVE_OTHERS},
       {"certificateManagerView", IDS_SETTINGS_CERTIFICATE_MANAGER_VIEW},
+      {"certificateManagerEdit", IDS_SETTINGS_CERTIFICATE_MANAGER_EDIT},
       {"certificateManagerImport", IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT},
       {"certificateManagerImportAndBind",
        IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_AND_BIND},
@@ -265,6 +258,12 @@ void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
+
+#if defined(USE_NSS_CERTS)
+  html_source->AddBoolean("useNssCerts", true);
+#else
+  html_source->AddBoolean("useNssCerts", false);
+#endif

[Dan Beam, 2016/03/24 17:57:16]

why are you pushing your handler's logic into a class named "localized strings"?

[dpapad, 2016/03/24 18:07:03]

Because the handler only exists if USE_NSS_CERTS is true but loadTimeData
"useNssCerts" needs to be available either way, see
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/....
I am not trying to continue any trend you don't like, happy to talk about
alternatives.

[Dan Beam, 2016/03/24 18:19:34]

why not just use <if> in the markup instead?
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/res...

[dpapad, 2016/03/24 21:33:43]

Done at https://codereview.chromium.org/1831093002. Once that CL lands, I will
rebase this one (and there will be no need for loadTimeDtaa useNssCerts
anymore).

[dpapad, 2016/03/25 18:24:01]

Done. Parent CL landed. Removed 'useNssCerts' loadTimeData since it is not
needed anymore.

 }
 
 void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {