Print Preview: Change getPrinterCapabilities to cr.sendWithPromise

chrome/browser/resources/print_preview/data/destination_store.js

 // 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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * A data store that stores destinations and dispatches events when the data
    * store changes.
@@ skipping 655 matching lines @@
      * @return {boolean} Whether capabilities fetch was successfully started.
      * @private
      */
     fetchPreselectedDestination_: function(
         origin, id, account, name, capabilities, extensionId, extensionName) {
       this.autoSelectMatchingDestination_ =
           this.createExactDestinationMatch_(origin, id);
 
       if (origin == print_preview.DestinationOrigin.LOCAL ||
           origin == print_preview.DestinationOrigin.CROS) {
-        this.nativeLayer_.startGetLocalDestinationCapabilities(id);
+        this.nativeLayer_.getPrinterCapabilities(id).then(
+            this.onLocalDestinationCapabilitiesSet_.bind(this),
+            this.onGetCapabilitiesFail_.bind(this,
+              /** @type {print_preview.DestinationOrigin} */ (origin)));

[dpapad, 2017/06/09 17:59:11]

Indent off by 2?

[rbpotter, 2017/06/14 03:55:07]

Done.

         return true;
       }
 
       if (this.cloudPrintInterface_ &&
           (origin == print_preview.DestinationOrigin.COOKIES ||
            origin == print_preview.DestinationOrigin.DEVICE)) {
         this.cloudPrintInterface_.printer(
             id,
             /** @type {print_preview.DestinationOrigin} */(origin),
             account);
@@ skipping 265 matching lines @@
           })) {
         this.metrics_.record(destination.isPrivet ?
             print_preview.Metrics.DestinationSearchBucket.
                 PRIVET_DUPLICATE_SELECTED :
             print_preview.Metrics.DestinationSearchBucket.
                 CLOUD_DUPLICATE_SELECTED);
       }
       // Notify about selected destination change.
       cr.dispatchSimpleEvent(
           this, DestinationStore.EventType.DESTINATION_SELECT);
-      // Request destination capabilities, of not known yet.
+      // Request destination capabilities from backend, since they are not
+      // known yet.
       if (destination.capabilities == null) {
         if (destination.isPrivet) {
-          this.nativeLayer_.startGetPrivetDestinationCapabilities(
-              destination.id);
+          this.nativeLayer_.getPrivetPrinterCapabilities(destination.id).then(
+              this.onPrivetCapabilitiesSet_.bind(this),
+              this.onGetCapabilitiesFail_.bind(this, destination.origin));
         } else if (destination.isExtension) {
-          this.nativeLayer_.startGetExtensionDestinationCapabilities(
-              destination.id);
+          this.nativeLayer_.getExtensionPrinterCapabilities(destination.id)
+              .then(
+                  this.onExtensionCapabilitiesSet_.bind(this),
+                  this.onGetCapabilitiesFail_.bind(this, destination.origin)
+              );
         } else if (destination.isLocal) {
-          this.nativeLayer_.startGetLocalDestinationCapabilities(
-              destination.id);
+          this.nativeLayer_.getPrinterCapabilities(destination.id).then(
+              this.onLocalDestinationCapabilitiesSet_.bind(this),
+              this.onGetCapabilitiesFail_.bind(this, destination.origin));
         } else {
           assert(this.cloudPrintInterface_ != null,
                  'Cloud destination selected, but GCP is not enabled');
           this.cloudPrintInterface_.printer(
               destination.id, destination.origin, destination.account);
         }
       } else {
         cr.dispatchSimpleEvent(
             this,
             DestinationStore.EventType.SELECTED_DESTINATION_CAPABILITIES_READY);
@@ skipping 347 matching lines @@
     },
 
     /**
      * Binds handlers to events.
      * @private
      */
     addEventListeners_: function() {
       var nativeLayerEventTarget = this.nativeLayer_.getEventTarget();
       this.tracker_.add(
           nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.CAPABILITIES_SET,
-          this.onLocalDestinationCapabilitiesSet_.bind(this));
-      this.tracker_.add(
-          nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.GET_CAPABILITIES_FAIL,
-          this.onGetCapabilitiesFail_.bind(this));
-      this.tracker_.add(
-          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.DESTINATIONS_RELOAD,
           this.onDestinationsReload_.bind(this));
       this.tracker_.add(
           nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.PRIVET_CAPABILITIES_SET,
-          this.onPrivetCapabilitiesSet_.bind(this));
-      this.tracker_.add(
-          nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.EXTENSION_CAPABILITIES_SET,
-          this.onExtensionCapabilitiesSet_.bind(this));
-      this.tracker_.add(
-          nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED,
           this.handleProvisionalDestinationResolved_.bind(this));
     },
 
     /**
      * Creates a local PDF print destination.
      * @private
      */
     createLocalPdfPrintDestination_: function() {
       // TODO(alekseys): Create PDF printer in the native code and send its
@@ skipping 42 matching lines @@
       this.isLocalDestinationSearchInProgress_ = false;
       cr.dispatchSimpleEvent(
           this, DestinationStore.EventType.DESTINATION_SEARCH_DONE);
     },
 
     /**
      * Called when the native layer retrieves the capabilities for the selected
      * local destination. Updates the destination with new capabilities if the
      * destination already exists, otherwise it creates a new destination and
      * then updates its capabilities.
-     * @param {Event} event Contains the capabilities of the local print
-     *     destination.
+     * @param {print_preview.PrinterCapabilitiesResponse} settingsInfo Contains
+     *     information about and capabilities of the local print destination.
      * @private
      */
-    onLocalDestinationCapabilitiesSet_: function(event) {
-      var destinationId = event.settingsInfo['printerId'];
-      var printerName = event.settingsInfo['printerName'];
-      var printerDescription = event.settingsInfo['printerDescription'];
+    onLocalDestinationCapabilitiesSet_: function(settingsInfo) {
+      var destinationId = settingsInfo['printerId'];
+      var printerName = settingsInfo['printerName'];
+      var printerDescription = settingsInfo['printerDescription'];
       // PDF is special since we don't need to query the device for
       // capabilities.
       var origin = destinationId ==
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF ?
           print_preview.DestinationOrigin.LOCAL : this.platformOrigin_;
       var key = this.getDestinationKey_(
           origin,
           destinationId,
           '');
       var destination = this.destinationMap_[key];
       var capabilities = DestinationStore.localizeCapabilities_(
-          event.settingsInfo.capabilities);
+          settingsInfo.capabilities);
       // Special case for PDF printer (until local printers capabilities are
       // reported in CDD format too).
       if (destinationId ==
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF) {
         if (destination) {
           destination.capabilities = capabilities;
         }
       } else {
         if (destination) {
           // In case there were multiple capabilities request for this local
           // destination, just ignore the later ones.
           if (destination.capabilities != null) {
             return;
           }
           destination.capabilities = capabilities;
         } else {
-          var isEnterprisePrinter = event.settingsInfo['cupsEnterprisePrinter'];
+          var isEnterprisePrinter = settingsInfo['cupsEnterprisePrinter'];
           destination = print_preview.LocalDestinationParser.parse(
               {deviceName: destinationId,
                printerName: printerName,
                cupsEnterprisePrinter: isEnterprisePrinter,
                printerDescription: printerDescription});
           destination.capabilities = capabilities;
           this.insertDestination_(destination);
         }
       }
       if (this.selectedDestination_ &&
           this.selectedDestination_.id == destinationId) {
         cr.dispatchSimpleEvent(
             this,
             DestinationStore.EventType.SELECTED_DESTINATION_CAPABILITIES_READY);
       }
     },
 
     /**
      * Called when a request to get a local destination's print capabilities
      * fails. If the destination is the initial destination, auto-select another
      * destination instead.
-     * @param {Event} event Contains the destination ID that failed.
+     * @param {print_preview.DestinationOrigin} origin The origin type of the
+     *     failed destination.
+     * @param {*} failedDestinationId The destination ID that failed.
      * @private
      */
-    onGetCapabilitiesFail_: function(event) {
+    onGetCapabilitiesFail_: function(origin, failedDestinationId) {
+      var destinationId = /** @type {string} */ (failedDestinationId);
       console.warn('Failed to get print capabilities for printer ' +
-                    event.destinationId);
+                    destinationId);
       if (this.autoSelectMatchingDestination_ &&
           this.autoSelectMatchingDestination_.matchIdAndOrigin(
-              event.destinationId, event.destinationOrigin)) {
+              destinationId, origin)) {
         this.selectDefaultDestination_();
       }
     },
 
     /**
      * Called when the /search call completes, either successfully or not.
      * In case of success, stores fetched destinations.
      * @param {Event} event Contains the request result.
      * @private
      */
@@ skipping 69 matching lines @@
         this.waitForRegisterDestination_ = null;
         this.onDestinationsReload_();
       } else {
         this.insertDestinations_(
             print_preview.PrivetDestinationParser.parse(printer));
       }
     },
 
     /**
      * Called when capabilities for a privet printer are set.
-     * @param {Object} event Contains the capabilities and printer ID.
+     * @param {!{printer: !Object,
+     *           capabilities: !print_preview.Cdd}} printerInfo Contains the
+     *     printer's description and capabilities.
      * @private
      */
-    onPrivetCapabilitiesSet_: function(event) {
+    onPrivetCapabilitiesSet_: function(printerInfo) {
       var destinations =
-          print_preview.PrivetDestinationParser.parse(event.printer);
+          print_preview.PrivetDestinationParser.parse(printerInfo.printer);
       destinations.forEach(function(dest) {
-        dest.capabilities = event.capabilities;
+        dest.capabilities = printerInfo.capabilities;
         this.updateDestination_(dest);
       }, this);
     },
 
     /**
      * Called when an extension responds to a getExtensionDestinations
      * request.
      * @param {!Array<!{extensionId: string,
      *                  extensionName: string,
      *                  id: string,
@@ skipping 14 matching lines @@
      */
     onExtensionPrintersDone_: function() {
       if (this.isExtensionDestinationSearchInProgress_) {
         clearTimeout(this.extensionSearchTimeout_);
         this.endExtensionPrinterSearch_();
       }
     },
 
     /**
      * Called when capabilities for an extension managed printer are set.
-     * @param {Object} event Contains the printer's capabilities and ID.
+     * @param {{"printerId": string,
+     *          "capabilities": print_preview.Cdd}} printerInfo Contains the
+     *     printer's ID and capabilities.
      * @private
      */
-    onExtensionCapabilitiesSet_: function(event) {
+    onExtensionCapabilitiesSet_: function(printerInfo) {
       var destinationKey = this.getDestinationKey_(
           print_preview.DestinationOrigin.EXTENSION,
-          event.printerId,
+          printerInfo.printerId,
           '' /* account */);
       var destination = this.destinationMap_[destinationKey];
       if (!destination)
         return;
-      destination.capabilities = event.capabilities;
+      destination.capabilities = printerInfo.capabilities;
       this.updateDestination_(destination);
     },
 
     /**
      * Called from native layer after the user was requested to sign in, and did
      * so successfully.
      * @private
      */
     onDestinationsReload_: function() {
       this.reset_();
@@ skipping 26 matching lines @@
       return this.getDestinationKey_(
           destination.origin, destination.id, destination.account);
     }
   };
 
   // Export
   return {
     DestinationStore: DestinationStore
   };
 });