summaryrefslogtreecommitdiffstats
path: root/printing/printing_context_mac.mm
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 23:37:47 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 23:37:47 +0000
commit19f09a635b8972b4831ba92d228c45e6438d6553 (patch)
treebd823fd8ec0d55d727d2a0bf4ae8c25ad20a69df /printing/printing_context_mac.mm
parent92c01741c76c821f2fc9434827dfd9455a971a30 (diff)
downloadchromium_src-19f09a635b8972b4831ba92d228c45e6438d6553.zip
chromium_src-19f09a635b8972b4831ba92d228c45e6438d6553.tar.gz
chromium_src-19f09a635b8972b4831ba92d228c45e6438d6553.tar.bz2
Cleanup: Make the PrintingContext::UpdatePrintSettings code more consistent across platfroms.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6932021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printing_context_mac.mm')
-rw-r--r--printing/printing_context_mac.mm15
1 files changed, 9 insertions, 6 deletions
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index 9333967..416a968 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -91,18 +91,21 @@ PrintingContext::Result PrintingContextMac::UpdatePrintSettings(
ResetSettings();
print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
+ bool collate;
+ bool color;
bool landscape;
- std::string device_name;
+ bool print_to_pdf;
int copies;
- bool collate;
int duplex_mode;
- bool color;
+ std::string device_name;
+
if (!job_settings.GetBoolean(kSettingLandscape, &landscape) ||
- !job_settings.GetString(kSettingDeviceName, &device_name) ||
- !job_settings.GetInteger(kSettingCopies, &copies) ||
!job_settings.GetBoolean(kSettingCollate, &collate) ||
+ !job_settings.GetBoolean(kSettingColor, &color) ||
+ !job_settings.GetBoolean(kSettingPrintToPDF, &print_to_pdf) ||
!job_settings.GetInteger(kSettingDuplexMode, &duplex_mode) ||
- !job_settings.GetBoolean(kSettingColor, &color)) {
+ !job_settings.GetInteger(kSettingCopies, &copies) ||
+ !job_settings.GetString(kSettingDeviceName, &device_name)) {
return OnError();
}