DOMUI Cert Manager: merge email certs into other certs tab.

chrome/browser/dom_ui/options/certificate_manager_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/certificate_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/safe_strerror_posix.h"
@@ skipping 232 matching lines @@
 void CertificateManagerHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString("certificateManagerPage",
       l10n_util::GetStringUTF16(IDS_CERTIFICATE_MANAGER_TITLE));
 
   // Tabs.
   localized_strings->SetString("personalCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PERSONAL_CERTS_TAB_LABEL));
-  localized_strings->SetString("emailCertsTabTitle",
-      l10n_util::GetStringUTF16(
-          IDS_CERT_MANAGER_OTHER_PEOPLES_CERTS_TAB_LABEL));
   localized_strings->SetString("serverCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_SERVER_CERTS_TAB_LABEL));
   localized_strings->SetString("caCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_CERT_AUTHORITIES_TAB_LABEL));
   localized_strings->SetString("unknownCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_UNKNOWN_TAB_LABEL));
 
   // Tab descriptions.
   localized_strings->SetString("personalCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_USER_TREE_DESCRIPTION));
-  localized_strings->SetString("emailCertsTabDescription",
-      l10n_util::GetStringUTF16(
-          IDS_CERT_MANAGER_OTHER_PEOPLE_TREE_DESCRIPTION));
   localized_strings->SetString("serverCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_SERVER_TREE_DESCRIPTION));
   localized_strings->SetString("caCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_AUTHORITIES_TREE_DESCRIPTION));
   localized_strings->SetString("unknownCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_UNKNOWN_TREE_DESCRIPTION));
 
   // Tree columns.
   localized_strings->SetString("certNameColumn",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_NAME_COLUMN_LABEL));
   localized_strings->SetString("certDeviceColumn",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DEVICE_COLUMN_LABEL));
   localized_strings->SetString("certSerialColumn",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_SERIAL_NUMBER_COLUMN_LABEL));
   localized_strings->SetString("certExpiresColumn",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPIRES_COLUMN_LABEL));
-  localized_strings->SetString("certEmailColumn",
-      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EMAIL_ADDRESS_COLUMN_LABEL));
 
   // Buttons.
   localized_strings->SetString("view_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   localized_strings->SetString("import_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_BUTTON));
   localized_strings->SetString("export_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_BUTTON));
   localized_strings->SetString("export_all_certificates",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_ALL_BUTTON));
   localized_strings->SetString("edit_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_BUTTON));
   localized_strings->SetString("delete_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_BUTTON));
 
   // Certificate Delete overlay strings.
   localized_strings->SetString("personalCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_USER_FORMAT));
   localized_strings->SetString("personalCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_USER_DESCRIPTION));
-  // For now, use the "unknown" strings for email certs too.  Maybe we should
-  // just get rid of the email tab.
-  localized_strings->SetString("emailCertsTabDeleteConfirm",
-      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_UNKNOWN_FORMAT));
-  localized_strings->SetString("emailCertsTabDeleteImpact", "");
   localized_strings->SetString("serverCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_SERVER_FORMAT));
   localized_strings->SetString("serverCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_SERVER_DESCRIPTION));
   localized_strings->SetString("caCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_CA_FORMAT));
   localized_strings->SetString("caCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_CA_DESCRIPTION));
   localized_strings->SetString("unknownCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_UNKNOWN_FORMAT));
@@ skipping 74 matching lines @@
 
   dom_ui_->RegisterMessageCallback("deleteCertificate",
       NewCallback(this, &CertificateManagerHandler::Delete));
 
   dom_ui_->RegisterMessageCallback("populateCertificateManager",
       NewCallback(this, &CertificateManagerHandler::Populate));
 }
 
 void CertificateManagerHandler::CertificatesRefreshed() {
   PopulateTree("personalCertsTab", net::USER_CERT);
-  PopulateTree("emailCertsTab", net::EMAIL_CERT);
   PopulateTree("serverCertsTab", net::SERVER_CERT);
   PopulateTree("caCertsTab", net::CA_CERT);
   PopulateTree("otherCertsTab", net::UNKNOWN_CERT);
   VLOG(1) << "populating finished";
 }
 
 void CertificateManagerHandler::FileSelected(const FilePath& path, int index,
                                              void* params) {
   switch (reinterpret_cast<intptr_t>(params)) {
     case EXPORT_PERSONAL_FILE_SELECTED:
@@ skipping 490 matching lines @@
   StringValue error_value(error);
   dom_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show",
                                   title_value,
                                   error_value,
                                   cert_error_list);
 }
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }