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

printing/print_job_constants.h

Index: printing/print_job_constants.h
diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h
index cbdad74fb85283a4a643665d0725cf6468c76d0f..87edb07836249482805ff7681f7f5aafb66682b4 100644
--- a/printing/print_job_constants.h
+++ b/printing/print_job_constants.h
@@ -7,6 +7,8 @@
 
 #include "printing/printing_export.h"
 
+#include <string>
+
 namespace printing {
 
 PRINTING_EXPORT extern const char kIsFirstRequest[];
@@ -48,6 +50,25 @@ PRINTING_EXPORT extern const char kSettingPrintToPDF[];
 PRINTING_EXPORT extern const int FIRST_PAGE_INDEX;
 PRINTING_EXPORT extern const int COMPLETE_PREVIEW_DOCUMENT_INDEX;
 
+#if defined (USE_CUPS)
+// Printer color models
+PRINTING_EXPORT extern const char kBlack[];
+PRINTING_EXPORT extern const char kCMYK[];
+PRINTING_EXPORT extern const char kKCMY[];
+PRINTING_EXPORT extern const char kCMY_K[];
+PRINTING_EXPORT extern const char kCMY[];
+PRINTING_EXPORT extern const char kColor[];
+PRINTING_EXPORT extern const char kGray[];
+PRINTING_EXPORT extern const char kGrayscale[];
+PRINTING_EXPORT extern const char kGreyscale[];
+PRINTING_EXPORT extern const char kMonochrome[];
+PRINTING_EXPORT extern const char kNormal[];
+PRINTING_EXPORT extern const char kNormalGray[];
+PRINTING_EXPORT extern const char kRGB[];
+PRINTING_EXPORT extern const char kRGBA[];
+PRINTING_EXPORT extern const char kRGB16[];
+#endif
+
 // Print job duplex mode values.
 enum DuplexMode {
   UNKNOWN_DUPLEX_MODE = -1,
@@ -70,12 +91,39 @@ enum VerticalHeaderFooterPosition {
 };
 
 // Print job color mode values.
-enum ColorMode {
-  GRAY = 1,
+enum ColorModels {
+  UNKNOWN_COLOR_MODEL,
+  GRAY,
   COLOR,
   CMYK,
+  CMY,
+  KCMY,
+  CMY_K,  // CMY_K represents CMY+K.
+  BLACK,
+  RGB,
+  RGB16,
+  RGBA,
+  COLORMODE_COLOR,  // Used in samsung printer ppds.
+  COLORMODE_MONOCHROME,  // Used in samsung printer ppds.
+  HP_COLOR_COLOR, // Used in HP color printer ppds.
+  HP_COLOR_BLACK, // Used in HP color printer ppds.
+  PRINTOUTMODE_NORMAL,  // Used in foomatic ppds.
+  PRINTOUTMODE_NORMAL_GRAY,  // Used in foomatic ppds.
+  PROCESSCOLORMODEL_CMYK,  // Used in canon printer ppds.
+  PROCESSCOLORMODEL_GREYSCALE,  // Used in canon printer ppds.
+  PROCESSCOLORMODEL_RGB,  // Used in canon printer ppds
 };
 
+#if defined (USE_CUPS)
+// Get the color model setting name and value for the |color_mode|.

[vandebo (ex-Chrome), 2011/10/11 19:11:42]

These aren't constants... Is there a better place for them?

[kmadhusu, 2011/10/11 21:36:03]

Moved to print_settings.h & .cc

+PRINTING_EXPORT void GetColorModelForMode(int color_mode,
+                                          std::string* color_setting_name,
+                                          std::string* color_value);
+#endif
+
+// Returns true if color model is selected.
+PRINTING_EXPORT bool isColorModelSelected(int model);
+
 }  // namespace printing
 
 #endif  // PRINTING_PRINT_JOB_CONSTANTS_H_