summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 17:39:47 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-29 17:39:47 +0000
commit6df7b5a2ccf86cc7134baa1e070d14bc7623d64c (patch)
treedb41a1171c2e33afb5fa3cc798fa5369ebb2954c /printing
parent13582f6b5aa6043c1d099ab78b86fe226939f967 (diff)
downloadchromium_src-6df7b5a2ccf86cc7134baa1e070d14bc7623d64c.zip
chromium_src-6df7b5a2ccf86cc7134baa1e070d14bc7623d64c.tar.gz
chromium_src-6df7b5a2ccf86cc7134baa1e070d14bc7623d64c.tar.bz2
Pass location and description of local printers into print preview.
OSX already uses description as display name for printers, so pass printer model instead. BUG=256223 NOTRY=true Review URL: https://codereview.chromium.org/214443007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/print_job_constants.cc6
-rw-r--r--printing/print_job_constants.h10
2 files changed, 12 insertions, 4 deletions
diff --git a/printing/print_job_constants.cc b/printing/print_job_constants.cc
index 6ccc4c1..6bc5941 100644
--- a/printing/print_job_constants.cc
+++ b/printing/print_job_constants.cc
@@ -123,6 +123,12 @@ const char kSettingPrintableAreaHeight[] = "printableAreaHeight";
// Printer name.
const char kSettingPrinterName[] = "printerName";
+// Printer description.
+const char kSettingPrinterDescription[] = "printerDescription";
+
+// Additional printer options.
+const char kSettingPrinterOptions[] = "printerOptions";
+
// Print to PDF option: true if selected, false if not.
const char kSettingPrintToPDF[] = "printToPDF";
diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h
index a480d01..260c1615 100644
--- a/printing/print_job_constants.h
+++ b/printing/print_job_constants.h
@@ -45,13 +45,15 @@ PRINTING_EXPORT extern const char kSettingPageRangeTo[];
PRINTING_EXPORT extern const char kSettingPageWidth[];
PRINTING_EXPORT extern const char kSettingPageHeight[];
PRINTING_EXPORT extern const char kSettingPreviewModifiable[];
+PRINTING_EXPORT extern const char kSettingPrintToPDF[];
+PRINTING_EXPORT extern const char kSettingPrintWithPrivet[];
+PRINTING_EXPORT extern const char kSettingPrintableAreaHeight[];
+PRINTING_EXPORT extern const char kSettingPrintableAreaWidth[];
PRINTING_EXPORT extern const char kSettingPrintableAreaX[];
PRINTING_EXPORT extern const char kSettingPrintableAreaY[];
-PRINTING_EXPORT extern const char kSettingPrintableAreaWidth[];
-PRINTING_EXPORT extern const char kSettingPrintableAreaHeight[];
+PRINTING_EXPORT extern const char kSettingPrinterDescription[];
PRINTING_EXPORT extern const char kSettingPrinterName[];
-PRINTING_EXPORT extern const char kSettingPrintToPDF[];
-PRINTING_EXPORT extern const char kSettingPrintWithPrivet[];
+PRINTING_EXPORT extern const char kSettingPrinterOptions[];
PRINTING_EXPORT extern const char kSettingTicket[];
PRINTING_EXPORT extern const char kSettingShouldPrintBackgrounds[];
PRINTING_EXPORT extern const char kSettingShouldPrintSelectionOnly[];