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 31 matching lines @@
     printerAddress: '',
     printerDescription: '',
     printerId: '',
     printerManufacturer: '',
     printerModel: '',
     printerName: '',
     printerPPDPath: '',
     printerProtocol: 'ipp',
     printerQueue: '',
     printerStatus: '',
+    autoconf: false,

[Carlson, 2017/05/31 16:58:52]

Dunno why the printerXXX naming convention is used here, but is there a reason
to break it?

[skau, 2017/06/01 21:50:28]

No reason either way AFAICT.  I've changed it.

   };
 }
 
 Polymer({
   is: 'add-printer-discovery-dialog',
 
   behaviors: [WebUIListenerBehavior],
 
   properties: {
     /** @type {!Array<!CupsPrinterInfo>|undefined} */
@@ skipping 99 matching lines @@
   switchToDiscoveryDialog_: function() {
     this.$$('add-printer-dialog').close();
     this.fire('open-discovery-printers-dialog');
   },
 
   /** @private */
   onCancelTap_: function() {
     this.$$('add-printer-dialog').close();
   },
 
+  /**
+   * @param {!PrinterMakeModel} info
+   * @private
+   * */
+  onPrinterFound_: function(info) {
+    this.newPrinter.printerManufacturer = info[0];
+    this.newPrinter.printerModel = info[1];
+    this.newPrinter.autoconf = info[2];
+
+    if (!this.newPrinter.autoconf) {
+      this.switchToManufacturerDialog_();
+      return;

[Carlson, 2017/05/31 16:58:52]

nit:  
if () {
  x
} else {
  y
}

seems slightly more elegant to me than

if () {
  x;
  return;
}
y;
 

you do the latter in a few places

[skau, 2017/06/01 21:50:28]

Done.

+    }
+
+    // Open configuring dialog.

[Carlson, 2017/05/31 16:58:52]

Generally, better to comment why you're doing stuff like this than just comment
what's happening.

[skau, 2017/06/01 21:50:28]

Done.

+    this.$$('add-printer-dialog').close();
+    this.fire('open-configuring-printer-dialog');
+  },
+
+  /**
+   * @param {!QueryFailure} rejected
+   * @private
+   */
+  infoFailed_: function(rejected) {

[Carlson, 2017/05/31 16:58:52]

Why is rejected not used?

[skau, 2017/06/01 21:50:29]

There's nothing useful in it at the moment.  But the contract for Promise
indicates that there should be an object passed to onRejection.

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Obje...

+    this.switchToManufacturerDialog_();
+  },
+
+  /** @private */
+  addPressed_: function() {
+    if (this.newPrinter.printerProtocol == 'ipp' ||
+        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;
     }
   },
 });