Skip to content

Commit

Permalink
Fix lack of preview when GCP printer is selected.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
abodenha@chromium.org committed Oct 4, 2011
1 parent 947c478 commit 737cfb2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions printing/printing_context_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
int color;
bool landscape;
bool print_to_pdf;
bool is_cloud_dialog;
int copies;
int duplex_mode;
std::string device_name;
Expand All @@ -121,13 +122,14 @@
!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();

Expand Down
6 changes: 4 additions & 2 deletions printing/printing_context_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 737cfb2

Please sign in to comment.