Print Preview: Get printer info with capabilities.

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 1231 matching lines @@
      * 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.
      * @private
      */
     onLocalDestinationCapabilitiesSet_: function(event) {
       var destinationId = event.settingsInfo['printerId'];
+      var printerName = event.settingsInfo['printerName'];
+      var printerDescription = event.settingsInfo['printerDescription'];
       var key = this.getDestinationKey_(
           print_preview.Destination.Origin.LOCAL,
           destinationId,
           '');
       var destination = this.destinationMap_[key];
       var capabilities = DestinationStore.localizeCapabilities_(
           event.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 {
-          // TODO(rltoscano): This makes the assumption that the "deviceName" is
-          // the same as "printerName". We should include the "printerName" in
-          // the response. See http://crbug.com/132831.
           destination = print_preview.LocalDestinationParser.parse(
-              {deviceName: destinationId, printerName: destinationId});
+              {deviceName: destinationId,
+               printerName: printerName,
+               printerDescription: printerDescription});
           destination.capabilities = capabilities;
           this.insertDestination_(destination);
         }
       }
       if (this.selectedDestination_ &&
           this.selectedDestination_.id == destinationId) {
-        cr.dispatchSimpleEvent(this,
-                               DestinationStore.EventType.
-                                   SELECTED_DESTINATION_CAPABILITIES_READY);
+        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.
      * @private
      */
@@ skipping 172 matching lines @@
       return this.getDestinationKey_(
           destination.origin, destination.id, destination.account);
     }
   };
 
   // Export
   return {
     DestinationStore: DestinationStore
   };
 });