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

Unified Diff: chrome/browser/resources/print_preview/data/destination_store.js

Issue 313723002: Convert local printer capabilites to CDD format to unify with cloud printers and PDF printer. This … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix clang reported errors. Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/print_preview/data/local_parsers.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview/data/destination_store.js
diff --git a/chrome/browser/resources/print_preview/data/destination_store.js b/chrome/browser/resources/print_preview/data/destination_store.js
index 1f45947a6838610cb2dccba35cc29318da04a687..84e54d537c9789a8d650ef9b708c1b7853e77a70 100644
--- a/chrome/browser/resources/print_preview/data/destination_store.js
+++ b/chrome/browser/resources/print_preview/data/destination_store.js
@@ -733,17 +733,16 @@ cr.define('print_preview', function() {
destinationId,
'');
var destination = this.destinationMap_[key];
+ var capabilities = DestinationStore.localizeCapabilities_(
+ event.settingsInfo.capabilities);
// Special case for PDF printer (until local printers capabilities are
// reported in CDD format too).
if (destinationId ==
print_preview.Destination.GooglePromotedId.SAVE_AS_PDF) {
if (destination) {
- destination.capabilities = DestinationStore.localizeCapabilities_(
- event.settingsInfo.capabilities);
+ destination.capabilities = capabilities;
}
} else {
- var capabilities = print_preview.LocalCapabilitiesParser.parse(
- event.settingsInfo);
if (destination) {
// In case there were multiple capabilities request for this local
// destination, just ignore the later ones.
« no previous file with comments | « no previous file | chrome/browser/resources/print_preview/data/local_parsers.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698