Separate manufacturer and model fields from PPD info

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 {
+    ppdManufacturer: '',
+    ppdModel: '',
     printerAddress: '',
     printerAutoconf: false,
     printerDescription: '',
     printerId: '',
     printerManufacturer: '',
     printerModel: '',
     printerName: '',
     printerPPDPath: '',
     printerProtocol: 'ipp',
     printerQueue: '',
@@ skipping 79 matching lines @@
     this.stopDiscoveringPrinters_();
     this.$$('add-printer-dialog').close();
   },
 
   /** @private */
   switchToManufacturerDialog_: function() {
     this.stopDiscoveringPrinters_();
     // If we're switching to the manufacturer/model dialog, clear the existing
     // data we have about the PPD (if any), as we're dropping that in favor of
     // user selections.
-    this.selectedPrinter.printerManufacturer = '';
-    this.selectedPrinter.printerModel = '';
+    this.selectedPrinter.ppdManufacturer = '';
+    this.selectedPrinter.ppdModel = '';
     this.selectedPrinter.printerPPDPath = '';
     this.$$('add-printer-dialog').close();
     this.fire('open-manufacturer-model-dialog');
   },
 });
 
 Polymer({
   is: 'add-printer-manually-dialog',
 
   properties: {
@@ skipping 58 matching lines @@
       type: Array,
     },
 
     setupFailed: {
       type: Boolean,
       value: false,
     },
   },
 
   observers: [
-    'selectedManufacturerChanged_(newPrinter.printerManufacturer)',
+    'selectedManufacturerChanged_(newPrinter.ppdManufacturer)',
   ],
 
   /** @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) {
     // Reset model if manufacturer is changed.
-    this.set('newPrinter.printerModel', '');
+    this.set('newPrinter.ppdModel', '');
     if (manufacturer) {
       settings.CupsPrintersBrowserProxyImpl.getInstance()
           .getCupsPrinterModelsList(manufacturer)
           .then(this.modelListChanged_.bind(this));
     }
   },
 
   /** @private */
   onBrowseFile_: function() {
     settings.CupsPrintersBrowserProxyImpl.getInstance()
@@ skipping 42 matching lines @@
   /**
    * @param {string} path The full path of the file
    * @return {string} The base name of the file
    * @private
    */
   getBaseName_: function(path) {
     return path.substring(path.lastIndexOf('/') + 1);
   },
 
   /**
-   * @param {string} printerManufacturer
-   * @param {string} printerModel
+   * @param {string} ppdManufacturer
+   * @param {string} ppdModel
    * @param {string} printerPPDPath
    * @return {boolean} Whether we have enough information to set up the printer
    * @private
    */
-  canAddPrinter_: function(printerManufacturer, printerModel, printerPPDPath) {
-    return !!((printerManufacturer && printerModel) || printerPPDPath);
+  canAddPrinter_: function(ppdManufacturer, ppdModel, printerPPDPath) {
+    return !!((ppdManufacturer && ppdModel) || printerPPDPath);
   },
 });
 
 Polymer({
   is: 'add-printer-configuring-dialog',
 
   properties: {
     printerName: String,
     dialogTitle: String,
   },
@@ skipping 220 matching lines @@
   onAddPrinter_: function(success, printerName) {
     this.$$('add-printer-configuring-dialog').close();
     if (success)
       return;
 
     if (this.previousDialog_ == AddPrinterDialogs.MANUFACTURER) {
       this.setupFailed = true;
     }
   },
 });