[Not for review]

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 92 matching lines @@
     this.fire('open-manually-add-printer-dialog');
   },
 
   /** @private */
   onCancelTap_: function() {
     this.stopDiscoveringPrinters_();
     this.$$('add-printer-dialog').close();
   },
 
   /** @private */
-  switchToConfiguringDialog_: function() {
+  switchToManufacturerDialog_: function() {
     this.stopDiscoveringPrinters_();
     this.$$('add-printer-dialog').close();
-    this.fire('open-configuring-printer-dialog');
+    this.fire('open-manufacturer-model-dialog');
   },
 });
 
 Polymer({
   is: 'add-printer-manually-dialog',
 
   properties: {
     /** @type {!CupsPrinterInfo} */
     newPrinter: {
       type: Object,
@@ skipping 49 matching lines @@
    */
   onProtocolChange_: function(event) {
     this.set('newPrinter.printerProtocol', event.target.value);
   },
 });
 
 Polymer({
   is: 'add-printer-manufacturer-model-dialog',
 
   properties: {
-    /** @type {!CupsPrinterInfo} */
+    /**
+     * The printer object from 'add-printer-manually-dialog'.
+     * @type {!CupsPrinterInfo}
+     */
     newPrinter: {
       type: Object,
       notify: true,
     },
 
+    /**
+     * The printer object from 'add-printer-discovery-dialog'.
+     * @type {!CupsPrinterInfo}
+     */
+    selectedPrinter: {
+      type: Object,
+      notify: true,
+    },
+
     /** @type {?Array<string>} */
     manufacturerList: {
       type: Array,
     },
 
     /** @type {?Array<string>} */
     modelList: {
       type: Array,
     },
 
     setupFailed: {
       type: Boolean,
       value: false,
     },
+
+    inManualFlow: {
+      type: Boolean,
+    },
+
+    /** @private {string} */
+    printerManufacturer_: {
+      type: String,
+      value: '',
+    },
+
+    /** @private {string} */
+    printerModel_: {
+      type: String,
+      value: '',
+    },
+
+    /** @private {string} */
+    printerPPDPath_: {
+      type: String,
+      value: '',
+    },
   },
 
   observers: [
-    'selectedManufacturerChanged_(newPrinter.printerManufacturer)',
+    'selectedManufacturerChanged_(printerManufacturer_)',
+    'selectedModelChanged_(printerModel_)',
   ],
 
   /** @override */
   ready: function() {
     settings.CupsPrintersBrowserProxyImpl.getInstance().
         getCupsPrinterManufacturersList().then(
             this.manufacturerListChanged_.bind(this));
   },
 
   /**
    * @param {string} manufacturer The manufacturer for which we are retrieving
    *     models.
    * @private
    */
   selectedManufacturerChanged_: function(manufacturer) {
+    if (this.inManualFlow) {
+      this.set('newPrinter.printerManufacturer', manufacturer);
+      this.set('newPrinter.printerModel', '');
+    } else {
+      this.set('selectedPrinter.printerManufacturer', manufacturer);
+      this.set('selectedPrinter.printerModel', '');
+    }
     // Reset model if manufacturer is changed.
-    this.set('newPrinter.printerModel', '');
+    this.printerModel_ = '';
     if (manufacturer) {
       settings.CupsPrintersBrowserProxyImpl.getInstance()
           .getCupsPrinterModelsList(manufacturer)
           .then(this.modelListChanged_.bind(this));
     }
   },
 
   /** @private */
+  selectedModelChanged_: function(model) {
+    if (this.inManualFlow)
+      this.set('newPrinter.printerModel', model);
+    else
+      this.set('selectedPrinter.printerModel', model);
+  },
+
+  /** @private */
   onBrowseFile_: function() {
     settings.CupsPrintersBrowserProxyImpl.getInstance().
         getCupsPrinterPPDPath().then(this.printerPPDPathChanged_.bind(this));
   },
 
   /**
    * @param {string} path
    * @private
    */
   printerPPDPathChanged_: function(path) {
-    this.set('newPrinter.printerPPDPath', path);
+    this.printerPPDPath_ = path;
+    if (this.inManualFlow)
+      this.set('newPrinter.printerPPDPath', path);
+    else
+      this.set('selectedPrinter.printerPPDPath', path);
     this.$$('paper-input').value = this.getBaseName_(path);
   },
 
   /**
    * @param {!ManufacturersInfo} manufacturersInfo
    * @private
    */
   manufacturerListChanged_: function(manufacturersInfo) {
     if (manufacturersInfo.success)
       this.manufacturerList = manufacturersInfo.manufacturers;
@@ skipping 86 matching lines @@
     newPrinter: {
       type: Object,
     },
 
     /** @type {boolean} whether the new printer setup is failed. */
     setupFailed: {
       type: Boolean,
       value: false,
     },
 
+    inManualFlow: {
+      type: Boolean,
+      value: false,
+    },
+
     configuringDialogTitle: String,
 
     /** @private {string} */
     previousDialog_: String,
 
     /** @private {string} */
     currentDialog_: String,
 
     /** @private {boolean} */
     showDiscoveryDialog_: Boolean,
@@ skipping 17 matching lines @@
   },
 
   /** @override */
   ready: function() {
     this.addWebUIListener('on-add-cups-printer', this.onAddPrinter_.bind(this));
   },
 
   /** Opens the Add printer discovery dialog. */
   open: function() {
     this.resetData_();
-    this.switchDialog_(
-        '', AddPrinterDialogs.MANUALLY, 'showManuallyAddDialog_');
+    this.switchDialog_('', AddPrinterDialogs.DISCOVERY, 'showDiscoveryDialog_');
   },
 
   /**
    * Reset all the printer data in the Add printer flow.
    * @private
    */
   resetData_: function() {
     if (this.selectedPrinter)
       this.selectedPrinter = this.getEmptyPrinter_();
     if (this.newPrinter)
@@ skipping 30 matching lines @@
   openDiscoveryPrintersDialog_: function() {
     this.switchDialog_(this.currentDialog_, AddPrinterDialogs.DISCOVERY,
                        'showDiscoveryDialog_');
   },
 
   /** @private */
   openConfiguringPrinterDialog_: function() {
     this.switchDialog_(
         this.currentDialog_, AddPrinterDialogs.CONFIGURING,
         'showConfiguringDialog_');
-    if (this.previousDialog_ == AddPrinterDialogs.DISCOVERY) {
+    if (!this.inManualFlow) {
       this.configuringDialogTitle =
           loadTimeData.getString('addPrintersNearbyTitle');
       settings.CupsPrintersBrowserProxyImpl.getInstance().addCupsPrinter(
           this.selectedPrinter);
-    } else if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
+    } else {
       this.configuringDialogTitle =
           loadTimeData.getString('addPrintersManuallyTitle');
       settings.CupsPrintersBrowserProxyImpl.getInstance().addCupsPrinter(
           this.newPrinter);
     }
   },
 
   /** @private */
   openManufacturerModelDialog_: function() {
+    if (this.currentDialog_ == AddPrinterDialogs.DISCOVERY)
+      this.inManualFlow = false;
+    else if (this.currentDialog_ == AddPrinterDialogs.MANUALLY)
+      this.inManualFlow = true;
+
     this.switchDialog_(this.currentDialog_, AddPrinterDialogs.MANUFACTURER,
                        'showManufacturerDialog_');
   },
 
   /** @private */
   configuringDialogClosed_: function() {
-    if (this.previousDialog_ == AddPrinterDialogs.MANUALLY) {
+    if (this.inManualFlow) {
       this.switchDialog_(
           this.currentDialog_, this.previousDialog_, 'showManuallyAddDialog_');
-    } else if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
+    } else {
       this.switchDialog_(
-          this.currentDialog_, this.previousDialog_, 'showManufacturerDialog_');
+          this.currentDialog_, this.previousDialog_, 'showDiscoveryDialog_');
     }
   },
 
   /**
    * Switch dialog from |fromDialog| to |toDialog|.
    * @param {string} fromDialog
    * @param {string} toDialog
    * @param {string} domIfBooleanName The name of the boolean variable
    *     corresponding to the |toDialog|.
    * @private
    */
   switchDialog_: function(fromDialog, toDialog, domIfBooleanName) {
     this.previousDialog_ = fromDialog;
     this.currentDialog_ = toDialog;
 
     this.set(domIfBooleanName, true);
     this.async(function() {
       var dialog = this.$$(toDialog);
       dialog.addEventListener('close', function() {
         this.set(domIfBooleanName, false);
       }.bind(this));
     });
   },
 
   /**
    * @return {string} The name of the current printer in configuration.
    * @private
    */
   getConfiguringPrinterName_: function() {
-    if (this.previousDialog_ == AddPrinterDialogs.DISCOVERY)
+    if (this.inManualFlow)
+      return this.newPrinter.printerName;
+    else
       return this.selectedPrinter.printerName;
-    if (this.previousDialog_ == AddPrinterDialogs.MANUALLY ||
-        this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
-      return this.newPrinter.printerName;
-    }
-    return '';
   },
 
   /**
    * @param {boolean} success
    * @param {string} printerName
    * @private
    */
   onAddPrinter_: function(success, printerName) {
     this.$$('add-printer-configuring-dialog').close();
     if (success)
       return;
 
     if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
       this.setupFailed = true;
     }
   },
 });