Linux Cert manager: improve PKCS #12 import error messages.

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 660 matching lines @@
 void CertificateManagerHandler::ImportPersonalSlotUnlocked() {
   // Determine if the private key should be unextractable after the import.
   // We do this by checking the value of |use_hardware_backed_| which is set
   // to true if importing into a hardware module. Currently, this only happens
   // for Chrome OS when the "Import and Bind" option is chosen.
   bool is_extractable = !use_hardware_backed_;
   int result = certificate_manager_model_->ImportFromPKCS12(
       module_, file_data_, password_, is_extractable);
   ImportExportCleanup();
   web_ui_->CallJavascriptFunction("CertificateRestoreOverlay.dismiss");
+  int string_id;
   switch (result) {
     case net::OK:
-      break;
+      return;
     case net::ERR_PKCS12_IMPORT_BAD_PASSWORD:
-      ShowError(
-          l10n_util::GetStringUTF8(IDS_CERT_MANAGER_PKCS12_IMPORT_ERROR_TITLE),
-          l10n_util::GetStringUTF8(IDS_CERT_MANAGER_BAD_PASSWORD));
       // TODO(mattm): if the error was a bad password, we should reshow the
       // password dialog after the user dismisses the error dialog.
+      string_id = IDS_CERT_MANAGER_BAD_PASSWORD;
+      break;
+    case net::ERR_PKCS12_IMPORT_INVALID_MAC:
+      string_id = IDS_CERT_MANAGER_PKCS12_IMPORT_INVALID_MAC;
+      break;
+    case net::ERR_PKCS12_IMPORT_INVALID_FILE:
+      string_id = IDS_CERT_MANAGER_PKCS12_IMPORT_INVALID_FILE;
+      break;
+    case net::ERR_PKCS12_IMPORT_UNSUPPORTED:
+      string_id = IDS_CERT_MANAGER_PKCS12_IMPORT_UNSUPPORTED;
       break;
     default:
-      ShowError(
-          l10n_util::GetStringUTF8(IDS_CERT_MANAGER_PKCS12_IMPORT_ERROR_TITLE),
-          l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR));
+      string_id = IDS_CERT_MANAGER_UNKNOWN_ERROR;
       break;
   }
+  ShowError(
+      l10n_util::GetStringUTF8(IDS_CERT_MANAGER_PKCS12_IMPORT_ERROR_TITLE),
+      l10n_util::GetStringUTF8(string_id));
 }
 
 void CertificateManagerHandler::CancelImportExportProcess(
     const ListValue* args) {
   ImportExportCleanup();
 }
 
 void CertificateManagerHandler::ImportExportCleanup() {
   file_path_.clear();
   password_.clear();
@@ skipping 279 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();
 }