diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 18:06:29 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 18:06:29 +0000 |
| commit | 737cfb2a8cc57c8fbc93c2fb5997f384e01bf0cc (patch) | |
| tree | f85bf9aa9e9a944b6cd47a26783c54265be224a9 | |
| parent | 947c4780335e9f7a1a9f604c8d4068d1737b40a5 (diff) | |
| download | chromium_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
| -rw-r--r-- | printing/printing_context_mac.mm | 6 | ||||
| -rw-r--r-- | printing/printing_context_win.cc | 6 |
2 files changed, 8 insertions, 4 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(); diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 70a3f91..3a1da66 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -330,6 +330,7 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings( int color; bool landscape; bool print_to_pdf; + bool is_cloud_dialog; int copies; int duplex_mode; string16 device_name; @@ -340,13 +341,14 @@ PrintingContext::Result PrintingContextWin::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) { // Default fallback to Letter size. gfx::Size paper_size; gfx::Rect paper_rect; |