PrintPreview: Added code to honor the grayscale color model.

BUG=None
TEST=Add a printer which supports grayscale and cmyk color models. Preview a
color webpage. Observe that the color options is displayed to the user.


Review URL: http://codereview.chromium.org/8280002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105528 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/printing/print_system_task_proxy.cc

@@ -148,6 +148,8 @@ bool getBasicColorModelSettings(
     *color_model_for_black = printing::BLACK;
   else if (ppdFindChoice(color_model, printing::kGray))
     *color_model_for_black = printing::GRAY;
+  else if (ppdFindChoice(color_model, printing::kGrayscale))
+    *color_model_for_black = printing::GRAYSCALE;
 
   if (ppdFindChoice(color_model, printing::kColor))
     *color_model_for_color = printing::COLOR;

chrome/browser/resources/print_preview/color_settings.js

@@ -77,8 +77,12 @@ cr.define('print_preview', function() {
       this.colorOption_.setAttribute('aria-hidden', disableColorOption);
 
       var setColorAsDefault = e.printerCapabilities.setColorAsDefault;
-      this.printerColorModelForColor_ =
-          e.printerCapabilities.printerColorModelForColor;
+      if (e.printerCapabilities.printerColorModelForColor) {
+        this.printerColorModelForColor_ =
+            e.printerCapabilities.printerColorModelForColor;
+      } else {
+        this.printerColorModelForColor_ = ColorSettings.COLOR;
+      }
       if (e.printerCapabilities.printerColorModelForBlack) {
         this.printerColorModelForBlack_ =
             e.printerCapabilities.printerColorModelForBlack;

printing/print_job_constants.h

@@ -98,6 +98,7 @@ enum ColorModels {
   KCMY,
   CMY_K,  // CMY_K represents CMY+K.
   BLACK,
+  GRAYSCALE,
   RGB,
   RGB16,
   RGBA,