PrintPreview: Fix printer color settings issues based on printer ppd/schema information.

chrome/browser/printing/print_dialog_gtk.cc

 // Copyright (c) 2011 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_dialog_gtk.h"
 
 #include <fcntl.h>
 #include <gtk/gtkpagesetupunixdialog.h>
 #include <gtk/gtkprintjob.h>
 #include <sys/stat.h>
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
 #include "printing/print_settings_initializer_gtk.h"
 
 using printing::PageRanges;
 using printing::PrintSettings;
 
 namespace {
 
-// CUPS ColorModel attribute and values.
-const char kCMYK[] = "CMYK";
+// CUPS ColorModel attributes.
+const char kCUPSColorMode[] = "cups-ColorMode";
 const char kCUPSColorModel[] = "cups-ColorModel";
-const char kColor[] = "Color";
-const char kGrayscale[] = "Grayscale";
+const char kCUPSPrintoutMode[] = "cups-PrintoutMode";
+const char kCUPSProcessColorModel[] = "cups-ProcessColorModel";
 
 // CUPS Duplex attribute and values.
 const char kCUPSDuplex[] = "cups-Duplex";
 const char kDuplexNone[] = "None";
 const char kDuplexTumble[] = "DuplexTumble";
 const char kDuplexNoTumble[] = "DuplexNoTumble";
 
 // Helper class to track GTK printers.
 class GtkPrinterList {
  public:
@@ skipping 140 matching lines @@
       gtk_print_settings_set_printer(gtk_settings_,
                                      gtk_printer_get_name(printer_));
       if (!page_setup_) {
         page_setup_ = gtk_printer_get_default_page_size(printer_);
       }
     }
 
     gtk_print_settings_set_n_copies(gtk_settings_, copies);
     gtk_print_settings_set_collate(gtk_settings_, collate);
 
     const char* color_mode;

[vandebo (ex-Chrome), 2011/10/07 18:23:30]

maybe call these two color_setting_name and color_value ?

[kmadhusu, 2011/10/10 23:34:26]

Done.

+    const char* color_settings = kCUPSColorModel;
     switch (color) {
       case printing::COLOR:
-        color_mode = kColor;
+        color_mode = printing::kColor;
         break;
       case printing::CMYK:
-        color_mode = kCMYK;
+        color_mode = printing::kCMYK;
+        break;
+      case printing::PRINTOUTMODE_NORMAL:
+        color_mode = printing::kNormal;
+        color_settings = kCUPSPrintoutMode;
+        break;
+      case printing::PRINTOUTMODE_NORMAL_GRAY:
+        color_mode = printing::kNormalGray;
+        color_settings = kCUPSPrintoutMode;
+        break;
+      case printing::RGB16:
+        color_mode = printing::kRGB16;
+        break;
+      case printing::CMY:
+        color_mode = printing::kCMY;
+        break;
+      case printing::CMY_K:
+        color_mode = printing::kCMY_K;
+        break;
+      case printing::BLACK:
+        color_mode = printing::kBlack;
+        break;
+      case printing::GRAY:
+        color_mode = printing::kGray;
+        break;
+      case printing::COLORMODE_COLOR:
+        color_settings = kCUPSColorMode;
+        color_mode = printing::kColor;
+        break;
+      case printing::COLORMODE_MONOCHROME:
+        color_settings = kCUPSColorMode;
+        color_mode = printing::kMonochrome;
+        break;
+      case printing::PROCESSCOLORMODEL_CMYK:
+        color_settings = kCUPSProcessColorModel;
+        color_mode = printing::kCMYK;
+        break;
+      case printing::PROCESSCOLORMODEL_GREYSCALE:
+        color_settings = kCUPSProcessColorModel;
+        color_mode = printing::kGreyscale;
+        break;
+      case printing::PROCESSCOLORMODEL_RGB:
+        color_settings = kCUPSProcessColorModel;
+        color_mode = printing::kRGB;
         break;
       default:
-        color_mode = kGrayscale;
+        color_mode = printing::kGrayscale;
         break;
     }
-    gtk_print_settings_set(gtk_settings_, kCUPSColorModel, color_mode);
+    gtk_print_settings_set(gtk_settings_, color_settings, color_mode);
 
     if (duplex_mode != printing::UNKNOWN_DUPLEX_MODE) {
       const char* cups_duplex_mode = NULL;
       switch (duplex_mode) {
         case printing::LONG_EDGE:
           cups_duplex_mode = kDuplexNoTumble;
           break;
         case printing::SHORT_EDGE:
           cups_duplex_mode = kDuplexTumble;
           break;
@@ skipping 189 matching lines @@
   // Printing finished. Matches AddRef() in PrintDocument();
   Release();
 }
 
 void PrintDialogGtk::InitPrintSettings(const PageRanges& page_ranges) {
   PrintSettings settings;
   printing::PrintSettingsInitializerGtk::InitPrintSettings(
       gtk_settings_, page_setup_, page_ranges, false, &settings);
   context_->InitWithSettings(settings);
 }