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

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 215 matching lines @@
   }
 
   PMPrintSettings pmPrintSettings =
       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
   return PMSetDuplex(pmPrintSettings, duplexSetting) == noErr;
 }
 
 bool PrintingContextMac::SetOutputColor(int color_mode) {
   PMPrintSettings pmPrintSettings =
       static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
-  CFStringRef output_color = NULL;
-  if (color_mode == printing::GRAY)
-    output_color = kGrayColor;
-  else if (color_mode == printing::CMYK)
-    output_color = kCMYK;
+  base::mac::ScopedCFTypeRef<CFStringRef> color_setting(kColorModel);

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

Can this code be shared with the gtk code somehow?

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

Done.

+  base::mac::ScopedCFTypeRef<CFStringRef> output_color;
+  if (color_mode == GRAY) {
+    output_color.reset(base::SysUTF8ToCFStringRef(kGray));
+  } else if (color_mode == CMYK) {
+    output_color.reset(base::SysUTF8ToCFStringRef(kCMYK));
+  } else if (color_mode == RGB) {
+    output_color.reset(base::SysUTF8ToCFStringRef(kRGB));
+  } else if (color_mode == RGB16) {
+    output_color.reset(base::SysUTF8ToCFStringRef(kRGB16));
+  } else if (color_mode == RGBA) {
+    output_color.reset(base::SysUTF8ToCFStringRef(kRGBA));
+  } else if (color_mode == HP_COLOR_COLOR) {
+    color_setting.reset(base::SysUTF8ToCFStringRef(kColor));
+    output_color.reset(base::SysUTF8ToCFStringRef(kColor));
+  } else if (color_mode == HP_COLOR_BLACK) {
+    color_setting.reset(base::SysUTF8ToCFStringRef(kColor));
+    output_color.reset(base::SysUTF8ToCFStringRef(kBlack));
+  }
 
   return PMPrintSettingsSetValue(pmPrintSettings,
-                                 kColorModel,
-                                 output_color,
+                                 color_setting.get(),
+                                 output_color.get(),
                                  false) == noErr;
 }
 
 PageRanges PrintingContextMac::GetPageRangesFromPrintInfo() {
   PageRanges page_ranges;
   NSDictionary* print_info_dict = [print_info_.get() dictionary];
   if (![[print_info_dict objectForKey:NSPrintAllPages] boolValue]) {
     PageRange range;
     range.from = [[print_info_dict objectForKey:NSPrintFirstPage] intValue] - 1;
     range.to = [[print_info_dict objectForKey:NSPrintLastPage] intValue] - 1;
@@ skipping 104 matching lines @@
 void PrintingContextMac::ReleaseContext() {
   print_info_.reset();
   context_ = NULL;
 }
 
 gfx::NativeDrawingContext PrintingContextMac::context() const {
   return context_;
 }
 
 }  // namespace printing