Remove AddPrinterDiscoveryDialog and AddPrinterConfiguringDialog

- This is another step in removing deprecated printer settings code.
- This removes unused dialogs.
- Adjusts browser tests to reflect this change.

Bug: 1005905
Test: Browser tests
Change-Id: I674f4436c4bd17351ff9db2c98e8602dd229ca96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939957
Commit-Queue: jimmy gong <jimmyxgong@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729872}

chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog.html

@@ -5,9 +5,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.html">
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
-<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
 <link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="cups_add_printer_dialog_elements.html">
@@ -15,66 +13,6 @@
 <link rel="import" href="cups_printer_shared_css.html">
 <link rel="import" href="cups_printers_browser_proxy.html">
 
-<dom-module id="add-printer-discovery-dialog">
-  <template>
-    <style include="cr-shared-style cups-printer-shared">
-      add-printer-list {
-        max-height: 310px;
-        overflow-y: auto;
-        position: absolute;
-        width: 100%;
-      }
-
-      #searchSpinner {
-        position: absolute;
-        top: 80%;
-      }
-
-      #searchSpinner paper-spinner-lite {
-        --paper-spinner-stroke-width: 2px;
-        height: 15px;
-        margin-inline-end: 3px;
-        margin-inline-start: 20px;
-        width: 15px;
-      }
-    </style>
-    <add-printer-dialog>
-      <div slot="dialog-title">$i18n{addPrintersNearbyTitle}</div>
-      <div slot="dialog-body">
-        <add-printer-list printers="[[discoveredPrinters]]"
-            selected-printer="{{selectedPrinter}}">
-        </add-printer-list>
-        <div class="center" id="noPrinterMessage"
-            hidden="[[discoveredPrinters.length]]">
-           $i18n{noPrinterNearbyMessage}
-        </div>
-        <div id="searchSpinner" hidden="[[!discovering_]]">
-          <paper-spinner-lite active="[[discovering_]]"></paper-spinner-lite>
-          <span>$i18n{searchingNearbyPrinters}</span>
-        </div>
-      </div>
-      <div slot="dialog-buttons">
-        <div>  <!-- Left group -->
-          <cr-button id="manuallyAddPrinterButton"
-              on-click="switchToManualAddDialog_">
-            $i18n{manuallyAddPrinterButtonText}
-          </cr-button>
-        </div>
-        <div>  <!-- Right group -->
-          <cr-button class="cancel-button" on-click="onCancelTap_">
-            $i18n{cancel}
-          </cr-button>
-          <cr-button class="action-button" id="addPrinterButton"
-              disabled="[[!canAddPrinter_(selectedPrinter)]]"
-              on-click="switchToConfiguringDialog_">
-            $i18n{addPrinterButtonText}
-          </cr-button>
-        </div>
-      </div>
-    </add-printer-dialog>
-  </template>
-</dom-module>
-
 <dom-module id="add-printer-manually-dialog">
   <template>
     <style include="cups-printer-shared"></style>
@@ -127,16 +65,12 @@
         </div>
       </div>
       <div slot="dialog-buttons">
-        <div>  <!-- Left group -->
-          <cr-button on-click="switchToDiscoveryDialog_"
-              hidden="[[enableUpdatedUi]]">
-            $i18n{discoverPrintersButtonText}
-          </cr-button>
-        </div>
-        <div>  <!-- Right group -->
+        <div>
           <cr-button class="cancel-button" on-click="onCancelTap_">
             $i18n{cancel}
           </cr-button>
+        </div>
+        <div>
           <cr-button id="addPrinterButton" class="action-button"
               on-click="addPressed_"
               disabled="[[!canAddPrinter_(newPrinter.*,
@@ -230,39 +164,10 @@
   </template>
 </dom-module>
 
-<dom-module id="add-printer-configuring-dialog">
-  <template>
-    <style include="cups-printer-shared">
-      [slot='dialog-body'] {
-        padding-top: 140px;
-        text-align: center;
-      }
-    </style>
-    <add-printer-dialog>
-      <div slot="dialog-title">[[dialogTitle]]</div>
-      <div slot="dialog-body">
-        <paper-spinner-lite active></paper-spinner-lite>
-        <div id="configuringMessage"></div>
-      </div>
-      <div slot="dialog-buttons">
-        <cr-button class="cancel-button" on-click="onCloseConfiguringTap_">
-          $i18n{close}
-        </cr-button>
-      </div>
-    </add-printer-dialog>
-  </template>
-</dom-module>
-
 <dom-module id="settings-cups-add-printer-dialog">
   <template>
     <style include="settings-shared"></style>
 
-    <!-- Printer Discovery Dialog -->
-    <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp>
-      <add-printer-discovery-dialog selected-printer="{{newPrinter}}">
-      </add-printer-discovery-dialog>
-    </template>
-
     <!-- Manually Add Printer Dialog -->
     <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp>
       <add-printer-manually-dialog new-printer="{{newPrinter}}"
@@ -270,14 +175,6 @@
       </add-printer-manually-dialog>
     </template>
 
-    <!-- Configuring Printer Dialog -->
-    <template is="dom-if" if="[[showConfiguringDialog_]]" restamp>
-      <add-printer-configuring-dialog
-          printer-name="[[newPrinter.printerName]]"
-          dialog-title="[[configuringDialogTitle]]">
-      </add-printer-configuring-dialog>
-    </template>
-
     <!-- Manufacturer and Model Dialog -->
     <template is="dom-if" if="[[showManufacturerDialog_]]" restamp>
       <add-printer-manufacturer-model-dialog active-printer="{{newPrinter}}">

chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog_elements.html

@@ -7,26 +7,6 @@
 <link rel="import" href="cups_printer_shared_css.html">
 <link rel="import" href="cups_printers_browser_proxy.html">
 
-<dom-module id="add-printer-list">
-  <template>
-    <style include="cups-printer-shared">
-      .list-item {
-        padding: 0 20px;
-      }
-    </style>
-    <div>
-      <array-selector id="arraySelector" items="[[printers]]"
-          selected="{{selectedPrinter}}">
-      </array-selector>
-      <template is="dom-repeat" items="[[printers]]" sort="sort_">
-        <button class="list-item" on-click="onSelect_">
-          [[item.printerName]]
-        </button>
-      </template>
-    </div>
-  </template>
-</dom-module>
-
 <dom-module id="add-printer-dialog">
   <template>
     <style include="settings-shared">

chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog_elements.js

@@ -2,43 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/** 'add-printers-list' is the list of discovered printers. */
-Polymer({
-  is: 'add-printer-list',
-
-  properties: {
-    /** @type {!Array<!CupsPrinterInfo>} */
-    printers: {
-      type: Array,
-      notify: true,
-    },
-
-    /** @type {!CupsPrinterInfo} */
-    selectedPrinter: {
-      type: Object,
-      notify: true,
-    },
-  },
-
-  /**
-   * @param {{model:Object}} event
-   * @private
-   */
-  onSelect_: function(event) {
-    this.selectedPrinter = event.model.item;
-  },
-
-  /**
-   * @param {!CupsPrinterInfo} first
-   * @param {!CupsPrinterInfo} second
-   * @return {number} The result of the comparison.
-   * @private
-   */
-  sort_: function(first, second) {
-    return settings.printing.alphabeticalSort(first, second);
-  },
-});
-
 /** 'add-printer-dialog' is the template of the Add Printer dialog. */
 Polymer({
   is: 'add-printer-dialog',