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 21 matching lines @@
  * @const {number}
  */
 var kPrinterListFullHeight = 350;
 
 /**
  * Return a reset CupsPrinterInfo object.
  *  @return {!CupsPrinterInfo}
  */
 function getEmptyPrinter_() {
   return {
+    printerAutoconf: false,
     printerAddress: '',
     printerDescription: '',
     printerId: '',
     printerManufacturer: '',
     printerModel: '',
     printerName: '',
     printerPPDPath: '',
     printerProtocol: 'ipp',
     printerQueue: '',
     printerStatus: '',
@@ skipping 109 matching lines @@
   switchToDiscoveryDialog_: function() {
     this.$$('add-printer-dialog').close();
     this.fire('open-discovery-printers-dialog');
   },
 
   /** @private */
   onCancelTap_: function() {
     this.$$('add-printer-dialog').close();
   },
 
+  /**
+   * Handler for getPrinterInfo success.
+   * @param {!PrinterMakeModel} info
+   * @private
+   * */
+  onPrinterFound_: function(info) {
+    this.newPrinter.printerManufacturer = info.manufacturer;
+    this.newPrinter.printerModel = info.model;
+    this.newPrinter.autoconf = info.autoconf;
+
+    // Show the manufacturer dialog if we can't autoconfigure.  Otherwise, show
+    // configuring while we wait.
+    if (!this.newPrinter.autoconf) {
+      this.switchToManufacturerDialog_();
+    } else {
+      this.$$('add-printer-dialog').close();
+      this.fire('open-configuring-printer-dialog');
+    }
+  },
+
+  /**
+   * Handler for getPrinterInfo failure.
+   * @param {!QueryFailure} rejected
+   * @private
+   */
+  infoFailed_: function(rejected) {
+    this.switchToManufacturerDialog_();
+  },
+
+  /** @private */
+  addPressed_: function() {
+    if (this.newPrinter.printerProtocol == 'ipp' ||

[xdai1, 2017/06/05 17:55:55]

Do you need to move line 216 - 218 to here?

[skau, 2017/06/07 23:55:39]

I've moved this query to the configuring screen instead so we get the same
behavior now.

+        this.newPrinter.printerProtocol == 'ipps') {
+      settings.CupsPrintersBrowserProxyImpl.getInstance().
+          getPrinterInfo(this.newPrinter).
+          then(this.onPrinterFound_.bind(this), this.infoFailed_.bind(this));
+      return;
+    }
+
+    this.switchToManufacturerDialog_();
+  },
+
   /** @private */
   switchToManufacturerDialog_: function() {
     // Set the default printer queue to be "ipp/print".
     if (!this.newPrinter.printerQueue)
       this.set('newPrinter.printerQueue', 'ipp/print');
 
     this.$$('add-printer-dialog').close();
     this.fire('open-manufacturer-model-dialog');
   },
 
@@ skipping 237 matching lines @@
   /** @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) {
+    } else if (
+        this.previousDialog_ == AddPrinterDialogs.MANUFACTURER ||
+        this.previousDialog_ == AddPrinterDialogs.MANUALLY) {
       this.configuringDialogTitle =
           loadTimeData.getString('addPrintersManuallyTitle');
       settings.CupsPrintersBrowserProxyImpl.getInstance().addCupsPrinter(
           this.newPrinter);
     }
   },
 
   /** @private */
   openManufacturerModelDialog_: function() {
     this.switchDialog_(this.currentDialog_, AddPrinterDialogs.MANUFACTURER,
@@ skipping 49 matching lines @@
   onAddPrinter_: function(success, printerName) {
     this.$$('add-printer-configuring-dialog').close();
     if (success)
       return;
 
     if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
       this.setupFailed = true;
     }
   },
 });