MD Settings: Certificate manager, move "Import" button to the tab level.

chrome/browser/resources/settings/certificate_manager_page/certificate_subentry.js

 // Copyright 2016 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.
 
 /**
  * @fileoverview settings-certificate-subentry represents an SSL certificate
  * sub-entry.
  */
 
 /**
  * The payload of the certificate-action event that is emitted from this
  * component.
  * @typedef {{
  *   action: !settings.CertificateAction,
- *   subnode: !CertificateSubnode,
+ *   subnode: ?CertificateSubnode,
  *   certificateType: !settings.CertificateType
  * }}
  */
 var CertificateActionEventDetail;
 
 cr.define('settings', function() {
   /**
    * Enumeration of actions that require a popup menu to be shown to the user.
    * @enum {number}
    */
   var CertificateAction = {
     DELETE: 0,
     EDIT: 1,
     EXPORT_PERSONAL: 2,
-    IMPORT_CA: 3,
-    IMPORT_PERSONAL: 4,
+    IMPORT: 3,
   };
 
   /**
    * The name of the event that is fired when a menu item is tapped.
    * @type {string}
    */
   var CertificateActionEvent = 'certificate-action';
 
   return {
     CertificateAction: CertificateAction,
@@ skipping 32 matching lines @@
         /** @type {!CertificateActionEventDetail} */ ({
           action: action,
           subnode: this.model,
           certificateType: this.certificateType,
         }));
   },
 
   /**
    * Handles the case where a call to the browser resulted in a rejected
    * promise.
-   * @param {null|!CertificatesError|!CertificatesImportError} error
+   * @param {?CertificatesError} error
    * @private
    */
   onRejected_: function(error) {
     if (error === null) {
       // Nothing to do here. Null indicates that the user clicked "cancel" on
       // the native file chooser dialog.
       return;
     }
 
     // Otherwise propagate the error to the parents, such that a dialog
@@ skipping 39 matching lines @@
           function() {
             this.dispatchCertificateActionEvent_(
                 settings.CertificateAction.EXPORT_PERSONAL);
           }.bind(this),
           this.onRejected_.bind(this));
     } else {
       this.browserProxy_.exportCertificate(this.model.id);
     }
   },
 
-  /** @private */
-  onImportTap_: function() {
-    this.closePopupMenu_();
-    if (this.certificateType == settings.CertificateType.PERSONAL) {
-      // TODO(dpapad): Figure out when to pass true (ChromeOS?).
-      this.browserProxy_.importPersonalCertificate(false).then(
-          function(showPasswordPrompt) {
-            if (showPasswordPrompt) {
-              this.dispatchCertificateActionEvent_(
-                  settings.CertificateAction.IMPORT_PERSONAL);
-            }
-          }.bind(this),
-          this.onRejected_.bind(this));
-    } else if (this.certificateType == settings.CertificateType.CA) {
-      this.browserProxy_.importCaCertificate().then(
-          function(certificateName) {
-            this.dispatchCertificateActionEvent_(
-                settings.CertificateAction.IMPORT_CA);
-          }.bind(this),
-          this.onRejected_.bind(this));
-    } else if (this.certificateType == settings.CertificateType.SERVER) {
-      this.browserProxy_.importServerCertificate().catch(
-          this.onRejected_.bind(this));
-    }
-  },
-
   /**
    * @param {string} certificateType The type of this certificate.
    * @return {boolean} Whether the certificate can be edited.
    * @private
    */
   canEdit_: function(certificateType) {
     return this.certificateType == settings.CertificateType.CA;
   },
 
-  /**
-   * @param {string} certificateType The type of this certificate.
-   * @return {boolean} Whether a certificate can be imported.
-   * @private
-   */
-  canImport_: function(certificateType) {
-    return this.certificateType != settings.CertificateType.OTHER;
-  },
-
   /** @private */
   closePopupMenu_: function() {
     this.$$('iron-dropdown').close();
   },
 });