summaryrefslogtreecommitdiffstats
path: root/printing/printing_context_mac.mm
diff options
context:
space:
mode:
authorabodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 18:06:29 +0000
committerabodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-04 18:06:29 +0000
commit737cfb2a8cc57c8fbc93c2fb5997f384e01bf0cc (patch)
treef85bf9aa9e9a944b6cd47a26783c54265be224a9 /printing/printing_context_mac.mm
parent947c4780335e9f7a1a9f604c8d4068d1737b40a5 (diff)
downloadchromium_src-737cfb2a8cc57c8fbc93c2fb5997f384e01bf0cc.zip
chromium_src-737cfb2a8cc57c8fbc93c2fb5997f384e01bf0cc.tar.gz
chromium_src-737cfb2a8cc57c8fbc93c2fb5997f384e01bf0cc.tar.bz2
Fix lack of preview when GCP printer is selected.
Add handling for the cloud print dialog to update settings code on Mac and Windows. BUG=98929 TEST= Review URL: http://codereview.chromium.org/8122006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printing_context_mac.mm')
-rw-r--r--printing/printing_context_mac.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index 3534496..15348a0 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -111,6 +111,7 @@ PrintingContext::Result PrintingContextMac::UpdatePrinterSettings(
int color;
bool landscape;
bool print_to_pdf;
+ bool is_cloud_dialog;
int copies;
int duplex_mode;
std::string device_name;
@@ -121,13 +122,14 @@ PrintingContext::Result PrintingContextMac::UpdatePrinterSettings(
!job_settings.GetBoolean(kSettingPrintToPDF, &print_to_pdf) ||
!job_settings.GetInteger(kSettingDuplexMode, &duplex_mode) ||
!job_settings.GetInteger(kSettingCopies, &copies) ||
- !job_settings.GetString(kSettingDeviceName, &device_name)) {
+ !job_settings.GetString(kSettingDeviceName, &device_name) ||
+ !job_settings.GetBoolean(kSettingCloudPrintDialog, &is_cloud_dialog)) {
return OnError();
}
bool print_to_cloud = job_settings.HasKey(printing::kSettingCloudPrintId);
- if (!print_to_pdf && !print_to_cloud) {
+ if (!print_to_pdf && !print_to_cloud && !is_cloud_dialog) {
if (!SetPrinter(device_name))
return OnError();