commit ca4af0b9ffd4ea27c1261d05c597d7a2c423575c
author thestig <thestig@chromium.org> Wed Mar 15 18:28:48 2017
committer Commit bot <commit-bot@chromium.org> Wed Mar 15 18:28:48 2017
tree 84f404ff55c5f0360b6db22159309ce63456b34a
parent 3033d50afdfff2e005c5fe14c9c588765610e6e9

Better distinguish between Brother CUPS and BRScript3 printers.

Try to set the color model correctly for both types.

BUG=415286

Review-Url: https://codereview.chromium.org/2754453003
Cr-Commit-Position: refs/heads/master@{#457148}

printing/backend/cups_helper.cc

diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index aaf3f86..2b845ffd 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -45,8 +45,6 @@
 constexpr char kBrotherDuplex[] = "BRDuplex";
 constexpr char kBrotherMonoColor[] = "BRMonoColor";
 constexpr char kBrotherPrintQuality[] = "BRPrintQuality";
-constexpr char kFullColor[] = "FullColor";
-constexpr char kMono[] = "Mono";
 
 const double kMicronsPerPoint = 10.0f * kHundrethsMMPerInch / kPointsPerInch;
 
@@ -281,14 +279,15 @@
   if (!color_mode_option)
     return false;
 
-  if (ppdFindChoice(color_mode_option, kFullColor) ||
-      ppdFindChoice(color_mode_option, kColor)) {
-    *color_model_for_color = BROTHER_COLOR_COLOR;
-  }
-  if (ppdFindChoice(color_mode_option, kBlack) ||
-      ppdFindChoice(color_mode_option, kMono)) {
-    *color_model_for_black = BROTHER_COLOR_BLACK;
-  }
+  if (ppdFindChoice(color_mode_option, kFullColor))
+    *color_model_for_color = BROTHER_CUPS_COLOR;
+  else if (ppdFindChoice(color_mode_option, kColor))
+    *color_model_for_color = BROTHER_BRSCRIPT3_COLOR;
+
+  if (ppdFindChoice(color_mode_option, kMono))
+    *color_model_for_black = BROTHER_CUPS_MONO;
+  else if (ppdFindChoice(color_mode_option, kBlack))
+    *color_model_for_black = BROTHER_BRSCRIPT3_BLACK;
 
   ppd_choice_t* marked_choice = ppdFindMarkedChoice(ppd, kColorMode);
   if (!marked_choice) {