Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Side by Side Diff: chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html

Issue 2825153002: Update CUPS settings UI to allow USB printers to be added via discovery. (Closed)
Patch Set: Remove extra copy code Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/md_select_css.html"> 1 <link rel="import" href="chrome://resources/html/md_select_css.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
7 <link rel="import" href="../i18n_setup.html"> 7 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="cups_add_printer_dialog_util.html"> 8 <link rel="import" href="cups_add_printer_dialog_util.html">
9 <link rel="import" href="cups_printers_browser_proxy.html"> 9 <link rel="import" href="cups_printers_browser_proxy.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 $i18n{manuallyAddPrinterButtonText} 68 $i18n{manuallyAddPrinterButtonText}
69 </paper-button> 69 </paper-button>
70 </div> 70 </div>
71 <div> <!-- Right group --> 71 <div> <!-- Right group -->
72 <paper-button class="cancel-button secondary-button" 72 <paper-button class="cancel-button secondary-button"
73 on-tap="onCancelTap_"> 73 on-tap="onCancelTap_">
74 $i18n{cancelButtonText} 74 $i18n{cancelButtonText}
75 </paper-button> 75 </paper-button>
76 <paper-button class="action-button" id="addPrinterButton" 76 <paper-button class="action-button" id="addPrinterButton"
77 disabled="[[!selectedPrinter]]" 77 disabled="[[!selectedPrinter]]"
78 on-tap="switchToConfiguringDialog_"> 78 on-tap="switchToManufacturerDialog_">
79 $i18n{addPrinterButtonText} 79 $i18n{addPrinterButtonText}
80 </paper-button> 80 </paper-button>
81 </div> 81 </div>
82 </div> 82 </div>
83 </add-printer-dialog> 83 </add-printer-dialog>
84 </template> 84 </template>
85 </dom-module> 85 </dom-module>
86 86
87 <dom-module id="add-printer-manually-dialog"> 87 <dom-module id="add-printer-manually-dialog">
88 <template> 88 <template>
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 </div> 310 </div>
311 </div> 311 </div>
312 </div> 312 </div>
313 <div class="error-message" hidden="[[!setupFailed]]"> 313 <div class="error-message" hidden="[[!setupFailed]]">
314 Driver not found (exact error message TBD) 314 Driver not found (exact error message TBD)
315 </div> 315 </div>
316 </div> 316 </div>
317 <div class="dialog-buttons"> 317 <div class="dialog-buttons">
318 <div> <!-- Left group --> 318 <div> <!-- Left group -->
319 <paper-button id="manuallyAddPrinterButton" class="secondary-button" 319 <paper-button id="manuallyAddPrinterButton" class="secondary-button"
320 on-tap="switchToManualAddDialog_"> 320 on-tap="switchToManualAddDialog_" hidden="[[!inManualFlow]]">
xdai1 2017/05/10 20:12:53 there is no inManualFlow property in add-printer-m
Carlson 2017/05/10 21:28:17 This is interesting, because I see what you're say
xdai1 2017/05/11 00:25:10 Not sure exactly why it works here. But I think wh
Carlson 2017/05/11 22:08:58 Should be better now.
321 $i18n{manuallyAddPrinterButtonText} 321 $i18n{back}
322 </paper-button> 322 </paper-button>
323 </div> 323 </div>
324 <div> <!-- Right group --> 324 <div> <!-- Right group -->
325 <paper-button class="cancel-button secondary-button" 325 <paper-button class="cancel-button secondary-button"
326 on-tap="onCancelTap_"> 326 on-tap="onCancelTap_">
327 $i18n{cancelButtonText} 327 $i18n{cancelButtonText}
328 </paper-button> 328 </paper-button>
329 <paper-button class="action-button" id="addPrinterButton" 329 <paper-button class="action-button" id="addPrinterButton"
330 on-tap="switchToConfiguringDialog_"> 330 on-tap="switchToConfiguringDialog_">
331 $i18n{addPrinterButtonText} 331 $i18n{addPrinterButtonText}
332 </paper-button> 332 </paper-button>
333 </div> 333 </div>
334 </div> 334 </div>
335 </add-printer-dialog> 335 </add-printer-dialog>
336 </template> 336 </template>
337 </dom-module> 337 </dom-module>
338 338
339 <dom-module id="add-printer-configuring-dialog"> 339 <dom-module id="add-printer-configuring-dialog">
340 <template> 340 <template>
341 <style include="settings-shared"> 341 <style include="settings-shared">
342 .dialog-body { 342 .dialog-body {
343 padding-top: 140px; 343 padding-top: 140px;
344 text-align: center; 344 text-align: center;
345 } 345 }
346 </style> 346 </style>
xdai1 2017/05/10 20:12:53 indent off
Carlson 2017/05/10 21:28:17 Done.
347 <add-printer-dialog> 347 <add-printer-dialog>
348 <div class="dialog-title">[[dialogTitle]]</div> 348 <div class="dialog-title">[[dialogTitle]]</div>
349 <div class="dialog-body"> 349 <div class="dialog-body">
350 <paper-spinner active></paper-spinner> 350 <paper-spinner active></paper-spinner>
351 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div> 351 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div>
352 </div> 352 </div>
353 <div class="dialog-buttons"> 353 <div class="dialog-buttons">
354 <paper-button class="cancel-button secondary-button" 354 <paper-button class="cancel-button secondary-button"
355 on-tap="onCancelConfiguringTap_"> 355 on-tap="onCancelConfiguringTap_">
356 $i18n{cancelButtonText} 356 $i18n{cancelButtonText}
357 </paper-button> 357 </paper-button>
358 </div> 358 </div>
359 </add-printer-dialog> 359 </add-printer-dialog>
360 </template> 360 </template>
361 </dom-module> 361 </dom-module>
362 362
363 <dom-module id="settings-cups-add-printer-dialog"> 363 <dom-module id="settings-cups-add-printer-dialog">
364 <template> 364 <template>
365 <style include="settings-shared"></style> 365 <style include="settings-shared"></style>
366 366
367 <!-- Printer Discovery Dialog --> 367 <!-- Printer Discovery Dialog -->
368 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> 368 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp>
369 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}"> 369 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}"
370 new-printer="{{newPrinter}}">
xdai1 2017/05/10 20:12:53 I still feel like add-printer-discovery-dialog sho
Carlson 2017/05/10 21:28:17 You're right, this isn't needed anymore, I just fo
370 </add-printer-discovery-dialog> 371 </add-printer-discovery-dialog>
371 </template> 372 </template>
372 373
373 <!-- Manually Add Printer Dialog --> 374 <!-- Manually Add Printer Dialog -->
374 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> 375 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp>
375 <add-printer-manually-dialog new-printer="{{newPrinter}}"> 376 <add-printer-manually-dialog new-printer="{{newPrinter}}">
376 </add-printer-manually-dialog> 377 </add-printer-manually-dialog>
377 </template> 378 </template>
378 379
379 <!-- Configuring Printer Dialog --> 380 <!-- Configuring Printer Dialog -->
380 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> 381 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp>
381 <add-printer-configuring-dialog 382 <add-printer-configuring-dialog
382 printer-name="[[getConfiguringPrinterName_()]]" 383 printer-name="[[getConfiguringPrinterName_()]]"
383 dialog-title="[[configuringDialogTitle]]"> 384 dialog-title="[[configuringDialogTitle]]">
384 </add-printer-configuring-dialog> 385 </add-printer-configuring-dialog>
385 </template> 386 </template>
386 387
387 <!-- Manufacturer and Model Dialog --> 388 <!-- Manufacturer and Model Dialog -->
388 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> 389 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp>
389 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" 390 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"
390 setup-failed="[[setupFailed]]"> 391 selected-printer="{{selectedPrinter}}" setup-failed="[[setupFailed]]"
392 in-manual-flow="[[inManualFlow]]">
xdai1 2017/05/10 20:12:53 Does this work? If add-printer-manufacturer-model-
Carlson 2017/05/10 21:28:17 It does seem to work. Do you want me to add the p
xdai1 2017/05/11 00:25:10 See my guess in the above comment. If my guess is
Carlson 2017/05/11 22:08:58 I think this is better now. inManualFlow no longe
391 </add-printer-manufacturer-model-dialog> 393 </add-printer-manufacturer-model-dialog>
392 </template> 394 </template>
393 395
394 </template> 396 </template>
395 <script src="cups_add_printer_dialog.js"></script> 397 <script src="cups_add_printer_dialog.js"></script>
396 </dom-module> 398 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698