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

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

Issue 214443007: Pass location and description of local printers into print preview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: chrome/browser/resources/print_preview/data/local_parsers.js
diff --git a/chrome/browser/resources/print_preview/data/local_parsers.js b/chrome/browser/resources/print_preview/data/local_parsers.js
index 91d5208978fc04fb8f51578874175dc42097f380..308e3c5a7a20d77d860652e7e2bbbc30eed0329f 100644
--- a/chrome/browser/resources/print_preview/data/local_parsers.js
+++ b/chrome/browser/resources/print_preview/data/local_parsers.js
@@ -14,14 +14,22 @@ cr.define('print_preview', function() {
* destination.
* @return {!print_preview.Destination} Parsed local print destination.
*/
- LocalDestinationParser.parse = function(destinationInfo) {
+ LocalDestinationParser.parse = function (destinationInfo) {
+ // Convert options into cloud print tags format.
+ var tags = Object.keys(destinationInfo.printerOptions).map(function (key) {
+ return "__cp__" + key + "=" + this[key]
Aleksey Shlyapnikov 2014/03/28 20:26:16 I'd use more specific prefix, __cp_local__ or some
+ }, destinationInfo.printerOptions);
return new print_preview.Destination(
destinationInfo.deviceName,
print_preview.Destination.Type.LOCAL,
print_preview.Destination.Origin.LOCAL,
destinationInfo.printerName,
false /*isRecent*/,
- print_preview.Destination.ConnectionStatus.ONLINE);
+ print_preview.Destination.ConnectionStatus.ONLINE,
+ {
+ 'tags': tags,
+ 'description': destinationInfo.printerDescription
+ });
};
/** Namespace that contains a method to parse local print capabilities. */
@@ -105,7 +113,7 @@ cr.define('print_preview', function() {
if (destinationInfo.isUnregistered) {
returnedPrinters.push(new print_preview.Destination(
- destinationInfo.serviceName,
+ destinationInfo.serviceName,
print_preview.Destination.Type.GOOGLE,
print_preview.Destination.Origin.PRIVET,
destinationInfo.name,

Powered by Google App Engine
This is Rietveld 408576698