diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 21:32:35 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 21:32:35 +0000 |
| commit | dc8373df869625617394cfe6790d2035852937b5 (patch) | |
| tree | 6271d0e68585caa8d410b49e164175e5731beb44 /printing | |
| parent | 0797eb8a732f398d039a5ce6ba0c2858854ffbb1 (diff) | |
| download | chromium_src-dc8373df869625617394cfe6790d2035852937b5.zip chromium_src-dc8373df869625617394cfe6790d2035852937b5.tar.gz chromium_src-dc8373df869625617394cfe6790d2035852937b5.tar.bz2 | |
Reland 100233 PrintPreview: Added code to identify the printer default duplex value.
Added code to identify the printer default duplex value. If we are
unable to get the default value, hide the two sided option in the preview tab.
BUG=89204
TEST=Please refer to bug description.
Original Commit: http://src.chromium.org/viewvc/chrome?view=rev&revision=100233
Try bot results are in http://codereview.chromium.org/7817013/ patch set 13.
Original Review URL: http://codereview.chromium.org/7817013/
Review URL: http://codereview.chromium.org/7859007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/print_job_constants.h | 1 | ||||
| -rw-r--r-- | printing/printing_context_mac.mm | 4 | ||||
| -rw-r--r-- | printing/printing_context_win.cc | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h index 99b2892..ebd63c2 100644 --- a/printing/print_job_constants.h +++ b/printing/print_job_constants.h @@ -49,6 +49,7 @@ PRINTING_EXPORT extern const int COMPLETE_PREVIEW_DOCUMENT_INDEX; // Print job duplex mode values. enum DuplexMode { + UNKNOWN_DUPLEX_MODE = -1, SIMPLEX, LONG_EDGE, SHORT_EDGE, diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm index 8ba4db8..3534496 100644 --- a/printing/printing_context_mac.mm +++ b/printing/printing_context_mac.mm @@ -236,9 +236,11 @@ bool PrintingContextMac::SetDuplexModeInPrintSettings(DuplexMode mode) { case SHORT_EDGE: duplexSetting = kPMDuplexTumble; break; - default: + case SIMPLEX: duplexSetting = kPMDuplexNone; break; + default: // UNKNOWN_DUPLEX_MODE + return true; } PMPrintSettings pmPrintSettings = diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index a098a66..c467457 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -383,9 +383,11 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings( case SHORT_EDGE: dev_mode->dmDuplex = DMDUP_HORIZONTAL; break; - default: // simplex + case SIMPLEX: dev_mode->dmDuplex = DMDUP_SIMPLEX; break; + default: // UNKNOWN_DUPLEX_MODE + break; } dev_mode->dmOrientation = landscape ? DMORIENT_LANDSCAPE : DMORIENT_PORTRAIT; |