[Not for review]

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html

Index: chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
diff --git a/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html b/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
index 3a8df8fbdc7e9df2a7027e75a5f845137e3189f4..9da50951e0e6dacbf49f0ad317f5f64321ae5df5 100644
--- a/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
+++ b/chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html
@@ -75,7 +75,7 @@
           </paper-button>
           <paper-button class="action-button" id="addPrinterButton"
               disabled="[[!selectedPrinter]]"
-              on-tap="switchToConfiguringDialog_">
+              on-tap="switchToManufacturerDialog_">
             $i18n{addPrinterButtonText}
           </paper-button>
         </div>
@@ -280,7 +280,7 @@
             <div class="label">$i18n{printerManufacturer}</div>
             <div class="secondary">
               <drop-down-search-box items="[[manufacturerList]]"
-                  selected-item="{{newPrinter.printerManufacturer}}">
+                  selected-item="{{printerManufacturer_}}">
               </drop-down-search-box>
             </div>
           </div>
@@ -290,7 +290,7 @@
             <div class="label">$i18n{printerModel}</div>
             <div class="secondary">
               <drop-down-search-box items="[[modelList]]"
-                  selected-item="{{newPrinter.printerModel}}">
+                  selected-item="{{printerModel_}}">
               </drop-down-search-box>
             </div>
           </div>
@@ -314,8 +314,8 @@
       <div class="dialog-buttons">
         <div>  <!-- Left group -->
           <paper-button id="manuallyAddPrinterButton" class="secondary-button"
-              on-tap="switchToManualAddDialog_">
-            $i18n{manuallyAddPrinterButtonText}
+              on-tap="switchToManualAddDialog_" hidden="[[!inManualFlow]]">
+            $i18n{back}
           </paper-button>
         </div>
         <div>  <!-- Right group -->
@@ -324,9 +324,9 @@
             $i18n{cancelButtonText}
           </paper-button>
           <paper-button class="action-button" id="addPrinterButton"
-              disabled="[[!canAddPrinter_(newPrinter.printerManufacturer,
-                                          newPrinter.printerModel,
-                                          newPrinter.printerPPDPath)]]"
+              disabled="[[!canAddPrinter_(printerManufacturer_,
+                                          printerModel_,
+                                          printerPPDPath_)]]"
               on-tap="switchToConfiguringDialog_">
             $i18n{addPrinterButtonText}
           </paper-button>
@@ -387,6 +387,8 @@
     <!-- Manufacturer and Model Dialog -->
     <template is="dom-if" if="[[showManufacturerDialog_]]" restamp>
       <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"
+          selected-printer="{{selectedPrinter}}"
+          in-manual-flow="{{inManualFlow}}"
           setup-failed="[[setupFailed]]">
       </add-printer-manufacturer-model-dialog>
     </template>