Update UI for extension destinations in print preview destination list

chrome/browser/resources/print_preview/data/destination.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.exportPath('print_preview');
 
 /**
  * The CDD (Cloud Device Description) describes the capabilities of a print
  * destination.
  *
@@ skipping 37 matching lines @@
    * @param {boolean} isRecent Whether the destination has been used recently.
    * @param {!print_preview.Destination.ConnectionStatus} connectionStatus
    *     Connection status of the print destination.
    * @param {{tags: (Array<string>|undefined),
    *          isOwned: (boolean|undefined),
    *          account: (string|undefined),
    *          lastAccessTime: (number|undefined),
    *          isTosAccepted: (boolean|undefined),
    *          cloudID: (string|undefined),
    *          extensionId: (string|undefined),
+   *          extensionName: (string|undefined),
    *          description: (string|undefined)}=} opt_params Optional parameters
    *     for the destination.
    * @constructor
    */
   function Destination(id, type, origin, displayName, isRecent,
                        connectionStatus, opt_params) {
     /**
      * ID of the destination.
      * @private {string}
      */
@@ skipping 85 matching lines @@
      * Cloud ID for Privet printers.
      * @private {string}
      */
     this.cloudID_ = (opt_params && opt_params.cloudID) || '';
 
     /**
      * Extension ID for extension managed printers.
      * @private {string}
      */
     this.extensionId_ = (opt_params && opt_params.extensionId) || '';
+
+    /**
+     * Extension name for extension managed printers.
+     * @private {string}
+     */
+    this.extensionName_ = (opt_params && opt_params.extensionName) || '';
   };
 
   /**
    * Prefix of the location destination tag.
    * @type {!Array<string>}
    * @const
    */
   Destination.LOCATION_TAG_PREFIXES = [
     '__cp__location=',
     '__cp__printer-location='
@@ skipping 163 matching lines @@
 
     /**
      * @return {string} Most relevant string to help user to identify this
      *     destination.
      */
     get hint() {
       if (this.id_ == Destination.GooglePromotedId.DOCS ||
           this.id_ == Destination.GooglePromotedId.FEDEX) {
         return this.account_;
       }
-      return this.location || this.description;
+      return this.location || this.extensionName || this.description;
     },
 
     /** @return {!Array<string>} Tags associated with the destination. */
     get tags() {
       return this.tags_.slice(0);
     },
 
     /** @return {string} Cloud ID associated with the destination */
     get cloudID() {
       return this.cloudID_;
     },
 
     /**
      * @return {string} Extension ID associated with the destination. Non-empty
      *     only for extension managed printers.
      */
     get extensionId() {
       return this.extensionId_;
     },
 
+    /**
+     * @return {string} Extension name associated with the destination.
+     *     Non-empty only for extension managed printers.
+     */
+    get extensionName() {
+      return this.extensionName_;
+    },
+
     /** @return {?print_preview.Cdd} Print capabilities of the destination. */
     get capabilities() {
       return this.capabilities_;
     },
 
     /**
      * @param {!print_preview.Cdd} capabilities Print capabilities of the
      *     destination.
      */
     set capabilities(capabilities) {
@@ skipping 51 matching lines @@
     },
 
     /** @return {string} Relative URL of the destination's icon. */
     get iconUrl() {
       if (this.id_ == Destination.GooglePromotedId.DOCS) {
         return Destination.IconUrl_.DOCS;
       } else if (this.id_ == Destination.GooglePromotedId.FEDEX) {
         return Destination.IconUrl_.FEDEX;
       } else if (this.id_ == Destination.GooglePromotedId.SAVE_AS_PDF) {
         return Destination.IconUrl_.PDF;
-      } else if (this.isExtension) {
-        // TODO(tbarzic): Update the way extension printers are displayed in the
-        // destination list when the desired UX is defined.
-        return 'chrome://extension-icon/' + this.extensionId + '/48/1';
       } else if (this.isLocal) {
         return Destination.IconUrl_.LOCAL;
       } else if (this.type_ == Destination.Type.MOBILE && this.isOwned_) {
         return Destination.IconUrl_.MOBILE;
       } else if (this.type_ == Destination.Type.MOBILE) {
         return Destination.IconUrl_.MOBILE_SHARED;
       } else if (this.isOwned_) {
         return Destination.IconUrl_.CLOUD;
       } else {
         return Destination.IconUrl_.CLOUD_SHARED;
       }
     },
 
     /**
+     * @return {string} For extension destinations returns the backgournd-image
+     *     style property of extension icon associated with the destination. The
+     *     icon should be used to attribute the destination to an extension.
+     *     For non extension destination, returns empty string.
+     */
+    get extensionIconImageStyle() {
+      if (!this.extensionId_)
+        return '';
+      return '-webkit-image-set(' +
+             'url(chrome://extension-icon/' + this.extensionId_ + '/24/1) 1x,' +
+             'url(chrome://extension-icon/' + this.extensionId_ + '/48/1) 2x)';
+    },

[Aleksey Shlyapnikov, 2015/03/06 00:27:39]

If it's not part of the generic iconUrl logic, can we move this knowledge to
presentation layer?

[tbarzic, 2015/03/06 03:16:11]

Done.

+
+    /**
      * @return {?boolean} Whether the user has accepted the terms-of-service of
      *     the print destination or {@code null} if a terms-of-service does not
      *     apply.
      */
     get isTosAccepted() {
       return this.isTosAccepted_;
     },
 
     /**
      * @param {?boolean} isTosAccepted Whether the user has accepted the
@@ skipping 13 matching lines @@
     },
 
     /**
      * Matches a query against the destination.
      * @param {!RegExp} query Query to match against the destination.
      * @return {boolean} {@code true} if the query matches this destination,
      *     {@code false} otherwise.
      */
     matches: function(query) {
       return !!this.displayName_.match(query) ||
+          !!this.extensionName_.match(query) ||
           this.extraPropertiesToMatch.some(function(property) {
             return property.match(query);
           });
     }
   };
 
   // Export
   return {
     Destination: Destination,
   };
 });