From 19f09a635b8972b4831ba92d228c45e6438d6553 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Wed, 4 May 2011 23:37:47 +0000 Subject: 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 --- printing/printing_context_mac.mm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'printing/printing_context_mac.mm') 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(); } -- cgit v1.1