Mark untrusted certificates as such in Linux UI.

chrome/browser/ui/webui/options/certificate_manager_handler.cc

 // Copyright (c) 2011 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/options/certificate_manager_handler.h"
 
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/memory/scoped_vector.h"
 #include "base/safe_strerror_posix.h"
 #include "base/string_number_conversions.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #endif
 
 namespace {
 
 static const char kKeyId[] = "id";
 static const char kSubNodesId[] = "subnodes";
 static const char kNameId[] = "name";
 static const char kReadOnlyId[] = "readonly";
+static const char kIsUntrusted[] = "untrusted";

[wtc, 2011/06/29 00:30:45]

kIsUntrusted => kUntrustedId

to follow the naming convention of the other char constants.

[agl, 2011/06/29 14:31:11]

Done.

 static const char kIconId[] = "icon";
 static const char kSecurityDeviceId[] = "device";
 static const char kErrorId[] = "error";
 
 // Enumeration of different callers of SelectFile.  (Start counting at 1 so
 // if SelectFile is accidentally called with params=NULL it won't match any.)
 enum {
   EXPORT_PERSONAL_FILE_SELECTED = 1,
   IMPORT_PERSONAL_FILE_SELECTED,
   IMPORT_SERVER_FILE_SELECTED,
@@ skipping 294 matching lines @@
           IDS_CERT_MANAGER_IMPORT_CA_DESCRIPTION_FORMAT));
   localized_strings->SetString("certificateCaTrustSSLLabel",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_SSL_LABEL));
   localized_strings->SetString("certificateCaTrustEmailLabel",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_EMAIL_LABEL));
   localized_strings->SetString("certificateCaTrustObjSignLabel",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_OBJSIGN_LABEL));
   localized_strings->SetString("certificateImportErrorFormat",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_ERROR_FORMAT));
 
+  // Badges next to certificates
+  localized_strings->SetString("badgeUntrusted",

[mattm, 2011/06/29 01:12:07]

maybe badgeCertUntrusted  (the localized strings namespace is shared among all
the options dialogs, so being more specific is good)

[agl, 2011/06/29 14:31:11]

Done.

+      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_UNTRUSTED));
+
 #if defined(OS_CHROMEOS)
   localized_strings->SetString("importAndBindCertificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_AND_BIND_BUTTON));
   localized_strings->SetString("hardwareBackedKeyFormat",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT));
   localized_strings->SetString("chromeOSDeviceName",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED));
 #endif  // defined(OS_CHROMEOS)
 }
 
@@ skipping 547 matching lines @@
       for (net::CertificateList::const_iterator org_cert_it = i->second.begin();
            org_cert_it != i->second.end(); ++org_cert_it) {
         DictionaryValue* cert_dict = new DictionaryValue;
         net::X509Certificate* cert = org_cert_it->get();
         cert_dict->SetString(kKeyId, CertToId(*cert));
         cert_dict->SetString(kNameId, certificate_manager_model_->GetColumnText(
             *cert, CertificateManagerModel::COL_SUBJECT_NAME));
         cert_dict->SetBoolean(
             kReadOnlyId,
             certificate_manager_model_->cert_db().IsReadOnly(cert));
+        cert_dict->SetBoolean(
+            kIsUntrusted,
+            certificate_manager_model_->cert_db().IsUntrusted(cert));
         // TODO(mattm): Other columns.
         cert_dict->SetString(kIconId, "none");
         subnodes->Append(cert_dict);
       }
       std::sort(subnodes->begin(), subnodes->end(), comparator);
 
       dict->Set(kSubNodesId, subnodes);
       nodes->Append(dict);
     }
     std::sort(nodes->begin(), nodes->end(), comparator);
@@ skipping 54 matching lines @@
   // TODO(xiyuan): Use async way when underlying supports it.
   FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
   web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                   ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }