PrintPreview: Fixed RICOH MP C3501 color print job issues.

printing/printing_context_mac.mm

 // 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 "printing/printing_context_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsexception_enabler.h"
 #include "base/sys_string_conversions.h"
 #include "base/values.h"
 #include "printing/print_settings_initializer_mac.h"
 
 static const CFStringRef kColorModel = CFSTR("ColorModel");
 static const CFStringRef kGrayColor = CFSTR("Gray");
+static const CFStringRef kCMYK = CFSTR("CMYK");
 
 namespace printing {
 
 // static
 PrintingContext* PrintingContext::Create(const std::string& app_locale) {
   return static_cast<PrintingContext*>(new PrintingContextMac(app_locale));
 }
 
 PrintingContextMac::PrintingContextMac(const std::string& app_locale)
     : PrintingContext(app_locale),
@@ skipping 70 matching lines @@
 
 PrintingContext::Result PrintingContextMac::UpdatePrinterSettings(
     const DictionaryValue& job_settings, const PageRanges& ranges) {
   DCHECK(!in_print_job_);
 
   // NOTE: Reset |print_info_| with a copy of |sharedPrintInfo| so as to start
   // with a clean slate.
   print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
 
   bool collate;
-  bool color;
+  int color;
   bool landscape;
   bool print_to_pdf;
   int copies;
   int duplex_mode;
   std::string device_name;
 
   if (!job_settings.GetBoolean(kSettingLandscape, &landscape) ||
       !job_settings.GetBoolean(kSettingCollate, &collate) ||
-      !job_settings.GetBoolean(kSettingColor, &color) ||
+      !job_settings.GetInteger(kSettingColor, &color) ||
       !job_settings.GetBoolean(kSettingPrintToPDF, &print_to_pdf) ||
       !job_settings.GetInteger(kSettingDuplexMode, &duplex_mode) ||
       !job_settings.GetInteger(kSettingCopies, &copies) ||
       !job_settings.GetString(kSettingDeviceName, &device_name)) {
     return OnError();
   }
 
   bool print_to_cloud = job_settings.HasKey(printing::kSettingCloudPrintId);
 
   if (!print_to_pdf && !print_to_cloud) {
     if (!SetPrinter(device_name))
       return OnError();
 
     if (!SetCopiesInPrintSettings(copies))
       return OnError();
 
     if (!SetCollateInPrintSettings(collate))
       return OnError();
 
     if (!SetDuplexModeInPrintSettings(
             static_cast<DuplexMode>(duplex_mode))) {
       return OnError();
     }
 
-    if (!SetOutputIsColor(color))
+    if (!SetOutputColor(color))
       return OnError();
   }
 
   if (!SetOrientationIsLandscape(landscape))
     return OnError();
 
   [print_info_.get() updateFromPMPrintSettings];
 
   InitPrintSettingsFromPrintInfo(ranges);
   return OK;
@@ skipping 83 matching lines @@
     default:
       duplexSetting = kPMDuplexNone;
       break;
   }
 
   PMPrintSettings pmPrintSettings =
       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
   return PMSetDuplex(pmPrintSettings, duplexSetting) == noErr;
 }
 
-bool PrintingContextMac::SetOutputIsColor(bool color) {
+bool PrintingContextMac::SetOutputColor(int color_mode) {
   PMPrintSettings pmPrintSettings =
       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
-  CFStringRef output_color = color ? NULL : kGrayColor;

[vandebo (ex-Chrome), 2011/09/02 22:38:18]

Setting the color model to NULL is color? That's kind of strange...

[kmadhusu, 2011/09/04 01:52:51]

If I remember correct, NULL will clear the previous print setting. I think, If
there is no "ColorModel" setting in the PMPrintSettings it will default it to
Color.

+  CFStringRef output_color = NULL;
+  if (color_mode == printing::GRAY)
+    output_color = kGrayColor;
+  else if (color_mode == printing::CMYK)
+    output_color = kCMYK;
 
   return PMPrintSettingsSetValue(pmPrintSettings,
                                  kColorModel,
                                  output_color,
                                  false) == noErr;
 }
 
 PageRanges PrintingContextMac::GetPageRangesFromPrintInfo() {
   PageRanges page_ranges;
   NSDictionary* print_info_dict = [print_info_.get() dictionary];
@@ skipping 108 matching lines @@
 void PrintingContextMac::ReleaseContext() {
   print_info_.reset();
   context_ = NULL;
 }
 
 gfx::NativeDrawingContext PrintingContextMac::context() const {
   return context_;
 }
 
 }  // namespace printing