MD Settings: Certificate manager, populate UI.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 184 matching lines @@
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 #endif
 
 void AddCertificateManagerStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"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},
       {"certificateManagerExport", IDS_SETTINGS_CERTIFICATE_MANAGER_EXPORT},
       {"certificateManagerDelete", IDS_SETTINGS_CERTIFICATE_MANAGER_DELETE},
       {"certificateManagerDone", IDS_SETTINGS_CERTIFICATE_MANAGER_DONE},
        // CA trust edit dialog.
       {"certificateManagerCaTrustEditDialogTitle",
        IDS_SETTINGS_CERTIFICATE_MANAGER_CA_TRUST_EDIT_DIALOG_TITLE},
       {"certificateManagerCaTrustEditDialogDescription",
@@ skipping 30 matching lines @@
        IDS_SETTINGS_CERTIFICATE_MANAGER_ENCRYPT_PASSWORD_DESCRIPTION},
       {"certificateManagerPassword",
        IDS_SETTINGS_CERTIFICATE_MANAGER_PASSWORD},
       {"certificateManagerConfirmPassword",
        IDS_SETTINGS_CERTIFICATE_MANAGER_CONFIRM_PASSWORD},
       {"certificateImportErrorFormat",
        IDS_SETTINGS_CERTIFICATE_MANAGER_IMPORT_ERROR_FORMAT},
   };
   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) {
   LocalizedString localized_strings[] = {
       {"clearFollowingItemsFrom", IDS_SETTINGS_CLEAR_FOLLOWING_ITEMS_FROM},
       {"clearBrowsingHistory", IDS_SETTINGS_CLEAR_BROWSING_HISTORY},
       {"clearDownloadHistory", IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY},
       {"clearCache", IDS_SETTINGS_CLEAR_CACHE},
       {"clearCookies", IDS_SETTINGS_CLEAR_COOKIES},
       {"clearCookiesFlash", IDS_SETTINGS_CLEAR_COOKIES_FLASH},
@@ skipping 622 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings