Merge 150683 - Fixed issue displaying print preview on Windows XP.

chrome/browser/printing/print_system_task_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_system_task_proxy.h"
 
 #include <ctype.h>
 
 #include <string>
 #include <vector>
@@ skipping 504 matching lines @@
     }
   }
 }
 #endif  // defined(OS_WIN)
 
 void PrintSystemTaskProxy::GetPrinterCapabilities(
     const std::string& printer_name) {
   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;
   int printer_color_space_for_color = printing::UNKNOWN_COLOR_MODEL;
   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);
+#else
+    NOTIMPLEMENTED();
+#endif
   }
-#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);
-#else
-  NOTIMPLEMENTED();
-#endif
   bool disable_color_options = (!printer_color_space_for_color ||
                                 !printer_color_space_for_black ||
                                 (printer_color_space_for_color ==
                                  printer_color_space_for_black));
 
   DictionaryValue settings_info;
   settings_info.SetString(kPrinterId, printer_name);
   settings_info.SetBoolean(kDisableColorOption, disable_color_options);
   if (printer_color_space_for_color == printing::UNKNOWN_COLOR_MODEL)
     printer_color_space_for_color = printing::COLOR;
@@ skipping 24 matching lines @@
       base::Bind(&PrintSystemTaskProxy::SendPrinterCapabilities, this,
                  settings_info.DeepCopy()));
 }
 
 void PrintSystemTaskProxy::SendPrinterCapabilities(
     DictionaryValue* settings_info) {
   if (handler_)
     handler_->SendPrinterCapabilities(*settings_info);
   delete settings_info;
 }