Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2983)

Unified Diff: chrome/browser/printing/print_system_task_proxy.cc

Issue 10829343: Merge 150683 - Fixed issue displaying print preview on Windows XP. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_system_task_proxy.cc
===================================================================
--- chrome/browser/printing/print_system_task_proxy.cc (revision 151718)
+++ chrome/browser/printing/print_system_task_proxy.cc (working copy)
@@ -522,11 +522,6 @@
VLOG(1) << "Get printer capabilities start for " << printer_name;
child_process_logging::ScopedPrinterInfoSetter prn_info(
print_backend_->GetPrinterDriverInfo(printer_name));
- printing::PrinterCapsAndDefaults printer_info;
- if (!print_backend_->GetPrinterCapsAndDefaults(printer_name,
- &printer_info)) {
- return;
- }
bool set_color_as_default = false;
bool set_duplex_as_default = false;
@@ -534,26 +529,30 @@
int printer_color_space_for_black = printing::UNKNOWN_COLOR_MODEL;
int default_duplex_setting_value = printing::UNKNOWN_DUPLEX_MODE;
+ printing::PrinterCapsAndDefaults printer_info;
+ if (print_backend_->GetPrinterCapsAndDefaults(printer_name,
+ &printer_info)) {
#if defined(USE_CUPS)
- if (!GetPrinterCapabilitiesCUPS(printer_info,
- printer_name,
- &set_color_as_default,
- &printer_color_space_for_color,
- &printer_color_space_for_black,
- &set_duplex_as_default,
- &default_duplex_setting_value)) {
- return;
- }
+ if (!GetPrinterCapabilitiesCUPS(printer_info,
+ printer_name,
+ &set_color_as_default,
+ &printer_color_space_for_color,
+ &printer_color_space_for_black,
+ &set_duplex_as_default,
+ &default_duplex_setting_value)) {
+ return;
+ }
#elif defined(OS_WIN)
- GetPrinterCapabilitiesWin(printer_info,
- &set_color_as_default,
- &printer_color_space_for_color,
- &printer_color_space_for_black,
- &set_duplex_as_default,
- &default_duplex_setting_value);
+ GetPrinterCapabilitiesWin(printer_info,
+ &set_color_as_default,
+ &printer_color_space_for_color,
+ &printer_color_space_for_black,
+ &set_duplex_as_default,
+ &default_duplex_setting_value);
#else
- NOTIMPLEMENTED();
+ NOTIMPLEMENTED();
#endif
+ }
bool disable_color_options = (!printer_color_space_for_color ||
!printer_color_space_for_black ||
(printer_color_space_for_color ==
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698