2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index c1811f5..e85e0fe 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/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;
diff --git a/chrome/browser/resources/print_preview/color_settings.js b/chrome/browser/resources/print_preview/color_settings.js
index 9289c9f..f64616b 100644
--- a/chrome/browser/resources/print_preview/color_settings.js
+++ b/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;