*WIP* Store NSS slots per profile. Move keygen to chrome.

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

 // Copyright (c) 2012 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 <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h"
-#include "chromeos/dbus/cryptohome_client.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 static const char kKeyId[] = "id";
 static const char kSubNodesId[] = "subnodes";
 static const char kNameId[] = "name";
 static const char kReadOnlyId[] = "readonly";
@@ skipping 233 matching lines @@
   *saved_errno = *bytes_written >= 0 ? 0 : errno;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  CertificateManagerHandler
 
 CertificateManagerHandler::CertificateManagerHandler()
     : use_hardware_backed_(false),
       file_access_provider_(new FileAccessProvider()),
       cert_id_map_(new CertIdMap),
-      weak_ptr_factory_(this) {
-  certificate_manager_model_.reset(new CertificateManagerModel(this));
-}
+      weak_ptr_factory_(this) {}
 
 CertificateManagerHandler::~CertificateManagerHandler() {
 }
 
 void CertificateManagerHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "certificateManagerPage",
                 IDS_CERTIFICATE_MANAGER_TITLE);
@@ skipping 160 matching lines @@
 
   web_ui()->RegisterMessageCallback(
       "deleteCertificate",
       base::Bind(&CertificateManagerHandler::Delete,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "populateCertificateManager",
       base::Bind(&CertificateManagerHandler::Populate,
                  base::Unretained(this)));
+}
 
-#if defined(OS_CHROMEOS)
-  web_ui()->RegisterMessageCallback(
-      "checkTpmTokenReady",
-      base::Bind(&CertificateManagerHandler::CheckTpmTokenReady,
-                 base::Unretained(this)));
-#endif
+void CertificateManagerHandler::CertificateManagerModelReady() {
+  web_ui()->CallJavascriptFunction("CertificateManager.onModelReady");
+  certificate_manager_model_->Refresh();
 }
 
 void CertificateManagerHandler::CertificatesRefreshed() {
   net::CertificateList web_trusted_certs;
 #if defined(OS_CHROMEOS)
   policy::UserNetworkConfigurationUpdater* service =
       policy::UserNetworkConfigurationUpdaterFactory::GetForProfile(
           Profile::FromWebUI(web_ui()));
   if (service)
     service->GetWebTrustedCertificates(&web_trusted_certs);
@@ skipping 485 matching lines @@
   bool result = certificate_manager_model_->Delete(cert);
   if (!result) {
     // TODO(mattm): better error messages?
     ShowError(
         l10n_util::GetStringUTF8(IDS_CERT_MANAGER_DELETE_CERT_ERROR_TITLE),
         l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR));
   }
 }
 
 void CertificateManagerHandler::Populate(const ListValue* args) {
-  certificate_manager_model_->Refresh();
+  if (certificate_manager_model_) {
+    if (certificate_manager_model_->is_ready()) {
+      // Re-run the webui initialization.
+      CertificateManagerModelReady();
+    }
+    // else wait for CertificateManagerModelReady to be called through the
+    // observer, as the init is still pending.
+  } else {
+    certificate_manager_model_.reset(
+        new CertificateManagerModel(Profile::FromWebUI(web_ui()), this));
+  }
 }
 
 void CertificateManagerHandler::PopulateTree(
     const std::string& tab_name,
     net::CertType type,
     const net::CertificateList& web_trust_certs) {
   const std::string tree_name = tab_name + "-tree";
 
   scoped_ptr<icu::Collator> collator;
   UErrorCode error = U_ZERO_ERROR;
@@ skipping 94 matching lines @@
   }
 
   StringValue title_value(title);
   StringValue error_value(error);
   web_ui()->CallJavascriptFunction("CertificateImportErrorOverlay.show",
                                    title_value,
                                    error_value,
                                    cert_error_list);
 }
 
-#if defined(OS_CHROMEOS)
-void CertificateManagerHandler::CheckTpmTokenReady(const ListValue* args) {
-  chromeos::CryptohomeClient* cryptohome_client =
-      chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
-  cryptohome_client->Pkcs11IsTpmTokenReady(
-      base::Bind(&CertificateManagerHandler::CheckTpmTokenReadyInternal,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-void CertificateManagerHandler::CheckTpmTokenReadyInternal(
-    chromeos::DBusMethodCallStatus call_status,
-    bool is_tpm_token_ready) {
-  base::FundamentalValue ready(
-      call_status == chromeos::DBUS_METHOD_CALL_SUCCESS && is_tpm_token_ready);
-  web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
-                                   ready);
-}
-#endif
-
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
 }
 
 }  // namespace options