PrintPreview: Fixed RICOH MP C3501 color print job issues.

chrome/browser/printing/print_dialog_gtk.cc

Index: chrome/browser/printing/print_dialog_gtk.cc
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 3e803edff28f33be2afe1720e1c4c24da6e4342e..ab000d9560a33d65f7e21b10075b02398eeae679 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -29,6 +29,7 @@ using printing::PrintSettings;
 namespace {
 
 // CUPS ColorModel attribute and values.
+const char kCMYK[] = "CMYK";
 const char kCUPSColorModel[] = "cups-ColorModel";
 const char kColor[] = "Color";
 const char kGrayscale[] = "Grayscale";
@@ -157,7 +158,7 @@ void PrintDialogGtk::UseDefaultSettings() {
 bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
                                     const printing::PageRanges& ranges) {
   bool collate;
-  bool color;
+  int color;
   bool landscape;
   bool print_to_pdf;
   int copies;
@@ -166,7 +167,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
 
   if (!settings.GetBoolean(printing::kSettingLandscape, &landscape) ||
       !settings.GetBoolean(printing::kSettingCollate, &collate) ||
-      !settings.GetBoolean(printing::kSettingColor, &color) ||
+      !settings.GetInteger(printing::kSettingColor, &color) ||
       !settings.GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf) ||
       !settings.GetInteger(printing::kSettingDuplexMode, &duplex_mode) ||
       !settings.GetInteger(printing::kSettingCopies, &copies) ||
@@ -184,8 +185,21 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
     }
     gtk_print_settings_set_n_copies(gtk_settings_, copies);
     gtk_print_settings_set_collate(gtk_settings_, collate);
-    gtk_print_settings_set(gtk_settings_, kCUPSColorModel,
-                           color ? kColor : kGrayscale);
+
+    const char* color_mode;
+    switch (color) {
+      case printing::COLOR:
+        color_mode = kColor;
+        break;
+      case printing::CMYK:
+        color_mode = kCMYK;
+        break;
+      default:
+        color_mode =kGrayscale;

[vandebo (ex-Chrome), 2011/09/04 17:24:39]

nit: space

[kmadhusu, 2011/09/05 17:37:20]

Done.

+        break;
+    }
+    gtk_print_settings_set(gtk_settings_, kCUPSColorModel,color_mode);

[vandebo (ex-Chrome), 2011/09/04 17:24:39]

nit: space

[kmadhusu, 2011/09/05 17:37:20]

Done.

+
     const char* cups_duplex_mode;
     switch (duplex_mode) {
       case printing::LONG_EDGE: