Query printers for autoconf info during setup.

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.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-cups-add-printer-dialog' includes multiple dialogs to
  * set up a new CUPS printer.
  * Subdialogs include:
  * - 'add-printer-discovery-dialog' is a dialog showing discovered printers on
  *   the network that are available for setup.
@@ skipping 22 matching lines @@
  */
 var kPrinterListFullHeight = 350;
 
 /**
  * Return a reset CupsPrinterInfo object.
  *  @return {!CupsPrinterInfo}
  */
 function getEmptyPrinter_() {
   return {
     printerAddress: '',
+    printerAutoconf: false,
     printerDescription: '',
     printerId: '',
     printerManufacturer: '',
     printerModel: '',
     printerName: '',
     printerPPDPath: '',
     printerProtocol: 'ipp',
     printerQueue: '',
     printerStatus: '',
   };
@@ skipping 109 matching lines @@
     this.$$('add-printer-dialog').close();
     this.fire('open-discovery-printers-dialog');
   },
 
   /** @private */
   onCancelTap_: function() {
     this.$$('add-printer-dialog').close();
   },
 
   /** @private */
-  switchToManufacturerDialog_: function() {
+  addPressed_: function() {
     // Set the default printer queue to be "ipp/print".
-    if (!this.newPrinter.printerQueue)
+    if (!this.newPrinter.printerQueue) {
       this.set('newPrinter.printerQueue', 'ipp/print');
+    } else if (this.newPrinter.printerQueue.charAt(0) == '/') {
+      // Strip a leading backslashes.  It is expected that this results in an

[stevenjb, 2017/06/08 15:58:28]

s/a leading backslashes/the leading backslash/

Also, is this being done for UI presentation, or for providing input to the
model (C++ code)? If the latter, we should really have the model just handle it.

[skau, 2017/06/08 22:11:26]

It's not for UI presentation.  It's been moved into the model.

+      // empty string if the input is just a backslash.
+      this.set('newPrinter.printerQueue',
+          this.newPrinter.printerQueue.substring(1));
+    }
 
     this.$$('add-printer-dialog').close();
-    this.fire('open-manufacturer-model-dialog');
+    this.fire('open-configuring-printer-dialog');
   },
 
   /** @private */
   onAddressChanged_: function() {
     // TODO(xdai): Check if the printer address exists and then show the
     // corresponding message after the API is ready.
     // The format of address is: ip-address-or-hostname:port-number.
   },
 
   /**
@@ skipping 220 matching lines @@
                        'showManuallyAddDialog_');
   },
 
   /** @private */
   openDiscoveryPrintersDialog_: function() {
     this.switchDialog_(this.currentDialog_, AddPrinterDialogs.DISCOVERY,
                        'showDiscoveryDialog_');
   },
 
   /** @private */
+  addPrinter_: function() {
+    settings.CupsPrintersBrowserProxyImpl.getInstance().
+       addCupsPrinter(this.newPrinter);
+  },
+
+  /**
+   * Handler for getPrinterInfo success.
+   * @param {!PrinterMakeModel} info
+   * @private
+   * */
+  onPrinterFound_: function(info) {
+    this.newPrinter.printerAutoconf = info.autoconf;
+    this.newPrinter.printerManufacturer = info.manufacturer;
+    this.newPrinter.printerModel = info.model;
+
+    // Add the printer if it's configurable.  Otherwise, forward to the
+    // manufacturer dialog.
+    if (this.newPrinter.printerAutoconf) {
+      this.addPrinter_();
+    } else {
+      this.$$('add-printer-configuring-dialog').close();
+      this.fire('open-manufacturer-model-dialog');
+    }
+  },
+
+  /**
+   * Handler for getPrinterInfo failure.
+   * @param {!QueryFailure} rejected
+   * @private
+   */
+  infoFailed_: function(rejected) {
+    this.$$('add-printer-configuring-dialog').close();
+    this.fire('open-manufacturer-model-dialog');
+  },
+
+  /** @private */
   openConfiguringPrinterDialog_: function() {
     this.switchDialog_(
         this.currentDialog_, AddPrinterDialogs.CONFIGURING,
         'showConfiguringDialog_');
     if (this.previousDialog_ == AddPrinterDialogs.DISCOVERY) {
       this.configuringDialogTitle =
           loadTimeData.getString('addPrintersNearbyTitle');
-      settings.CupsPrintersBrowserProxyImpl.getInstance().addCupsPrinter(
-          this.newPrinter);
-    } else if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
+      this.addPrinter_();
+    } else if (
+        this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
       this.configuringDialogTitle =
           loadTimeData.getString('addPrintersManuallyTitle');
-      settings.CupsPrintersBrowserProxyImpl.getInstance().addCupsPrinter(
-          this.newPrinter);
+      this.addPrinter_();
+    } else if (this.previousDialog_ == AddPrinterDialogs.MANUALLY) {
+      this.configuringDialogTitle =
+          loadTimeData.getString('addPrintersManuallyTitle');
+      if (this.newPrinter.printerProtocol == 'ipp' ||
+          this.newPrinter.printerProtocol == 'ipps') {
+        settings.CupsPrintersBrowserProxyImpl.getInstance().
+            getPrinterInfo(this.newPrinter).

[stevenjb, 2017/06/08 15:58:27]

Does getPrinterInfo ever return an error (e.g. if it can't find the printer)? If
so, we need to check for that and handle it in onPrinterFound_() (or in a
wrapper function).

[skau, 2017/06/08 22:11:26]

No.  If there's an error in getPrinterInfo, we reject the promise and infoFailed
gets called.

+            then(
+                this.onPrinterFound_.bind(this), this.infoFailed_.bind(this));
+      } else {
+        this.$$('add-printer-configuring-dialog').close();
+        this.fire('open-manufacturer-model-dialog');

[stevenjb, 2017/06/08 15:58:27]

Looks like we do these two things in several places, maybe add a helper method.

[skau, 2017/06/08 22:11:26]

Done.

+      }
     }
   },
 
   /** @private */
   openManufacturerModelDialog_: function() {
     this.switchDialog_(this.currentDialog_, AddPrinterDialogs.MANUFACTURER,
                        'showManufacturerDialog_');
   },
 
   /** @private */
@@ skipping 45 matching lines @@
   onAddPrinter_: function(success, printerName) {
     this.$$('add-printer-configuring-dialog').close();
     if (success)
       return;
 
     if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
       this.setupFailed = true;
     }
   },
 });