Include printer name for the make/model dialog subtext

- Previously, only discovered printers would show the subtext in the
  make/model dialog.
- This change will enable the subtext in the make/model dialog for manual
  printers.

Bug: 955130
Test: end to end manual
Change-Id: If1421bc0db890bdd8e66aa93abf0dc1a4e007289
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635852Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Commit-Queue: jimmy gong <jimmyxgong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665688}

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html

@@ -172,16 +172,16 @@
     <style include="cups-printer-shared">
       .subtext {
         margin-bottom: 10px;
+        padding-inline-end: 20px;
         padding-inline-start: 20px;
       }
     </style>
     <add-printer-dialog>
       <div slot="dialog-title">$i18n{manufacturerAndModelDialogTitle}</div>
       <div slot="dialog-body">
-        <div class="subtext" id="makeModelTextInfo"
-            hidden="[[!activePrinter.printerMakeAndModel]]">
-          <span>[[getManufacturerAndModelSubtext_(
-              activePrinter.printerMakeAndModel)]]</span>
+        <div class="subtext" id="makeModelTextInfo">
+          <span>[[getManufacturerAndModelSubtext_(activePrinter.*)]]
+          </span>
           <a href="$i18n{printingCUPSPrintLearnMoreUrl}" target="_blank">
             $i18n{learnMore}
           </a>

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js

@@ -263,14 +263,21 @@ Polymer({
   },
 
   /**
-   * @param {string} printerMakeAndModel
+   * If the printer is a nearby printer, return make + model with the subtext.
+   * Otherwise, return printer name.
    * @return {string} The additional information subtext of the manufacturer and
    * model dialog.
    * @private
    */
-  getManufacturerAndModelSubtext_: function(printerMakeAndModel) {
+  getManufacturerAndModelSubtext_: function() {
+    if (this.activePrinter.printerMakeAndModel) {
+      return loadTimeData.getStringF(
+          'manufacturerAndModelAdditionalInformation',
+          this.activePrinter.printerMakeAndModel);
+    }
     return loadTimeData.getStringF(
-        'manufacturerAndModelAdditionalInformation', printerMakeAndModel);
+        'manufacturerAndModelAdditionalInformation',
+        this.activePrinter.printerName);
   },
 
   /**