commit 91d04b6f3dd86851c91fd82107ee1c6c1adce5e5
author thestig <thestig@chromium.org> Thu Mar 23 19:39:13 2017
committer Commit bot <commit-bot@chromium.org> Thu Mar 23 19:39:13 2017
tree 8e890e686ad0eebac1dc79b623bd40d35e5e51ca
parent a0d155d336a59388f84140f7b4c4f79cb1f36e40

Better detect color options for Samsung CUPS printers.

BUG=702803

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

printing/backend/cups_helper.cc

diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index 2b845ffd..d352ccf8c 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -23,6 +23,8 @@
 #include "printing/units.h"
 #include "url/gurl.h"
 
+using base::EqualsCaseInsensitiveASCII;
+
 namespace printing {
 
 // This section contains helper code for PPD parsing for semantic capabilities.
@@ -46,6 +48,10 @@
 constexpr char kBrotherMonoColor[] = "BRMonoColor";
 constexpr char kBrotherPrintQuality[] = "BRPrintQuality";
 
+// Samsung printer specific options.
+constexpr char kSamsungColorTrue[] = "True";
+constexpr char kSamsungColorFalse[] = "False";
+
 const double kMicronsPerPoint = 10.0f * kHundrethsMMPerInch / kPointsPerInch;
 
 void ParseLpOptions(const base::FilePath& filepath,
@@ -88,7 +94,7 @@
     if (name.empty())
       continue;
 
-    if (!base::EqualsCaseInsensitiveASCII(printer_name, name))
+    if (!EqualsCaseInsensitiveASCII(printer_name, name))
       continue;  // This is not the required printer.
 
     line = line.substr(space_found + 1);
@@ -146,9 +152,9 @@
 
   *duplex_capable = true;
   const char* choice = duplex_choice->choice;
-  if (base::EqualsCaseInsensitiveASCII(choice, kDuplexNone)) {
+  if (EqualsCaseInsensitiveASCII(choice, kDuplexNone)) {
     *duplex_default = SIMPLEX;
-  } else if (base::EqualsCaseInsensitiveASCII(choice, kDuplexTumble)) {
+  } else if (EqualsCaseInsensitiveASCII(choice, kDuplexTumble)) {
     *duplex_default = SHORT_EDGE;
   } else {
     *duplex_default = LONG_EDGE;
@@ -193,9 +199,9 @@
 
   if (marked_choice) {
     *color_is_default =
-        !base::EqualsCaseInsensitiveASCII(marked_choice->choice, kBlack) &&
-        !base::EqualsCaseInsensitiveASCII(marked_choice->choice, kGray) &&
-        !base::EqualsCaseInsensitiveASCII(marked_choice->choice, kGrayscale);
+        !EqualsCaseInsensitiveASCII(marked_choice->choice, kBlack) &&
+        !EqualsCaseInsensitiveASCII(marked_choice->choice, kGray) &&
+        !EqualsCaseInsensitiveASCII(marked_choice->choice, kGrayscale);
   }
   return true;
 }
@@ -226,12 +232,9 @@
                                            printout_mode->defchoice);
   }
   if (printout_mode_choice) {
-    if (base::EqualsCaseInsensitiveASCII(printout_mode_choice->choice,
-                                         kNormalGray) ||
-        base::EqualsCaseInsensitiveASCII(printout_mode_choice->choice,
-                                         kHighGray) ||
-        base::EqualsCaseInsensitiveASCII(printout_mode_choice->choice,
-                                         kDraftGray)) {
+    if (EqualsCaseInsensitiveASCII(printout_mode_choice->choice, kNormalGray) ||
+        EqualsCaseInsensitiveASCII(printout_mode_choice->choice, kHighGray) ||
+        EqualsCaseInsensitiveASCII(printout_mode_choice->choice, kDraftGray)) {
       *color_model_for_black = PRINTOUTMODE_NORMAL_GRAY;
       *color_is_default = false;
     }
@@ -248,11 +251,15 @@
   if (!color_mode_option)
     return false;
 
-  if (ppdFindChoice(color_mode_option, kColor))
+  if (ppdFindChoice(color_mode_option, kColor) ||
+      ppdFindChoice(color_mode_option, kSamsungColorTrue)) {
     *color_model_for_color = COLORMODE_COLOR;
+  }
 
-  if (ppdFindChoice(color_mode_option, kMonochrome))
+  if (ppdFindChoice(color_mode_option, kMonochrome) ||
+      ppdFindChoice(color_mode_option, kSamsungColorFalse)) {
     *color_model_for_black = COLORMODE_MONOCHROME;
+  }
 
   ppd_choice_t* mode_choice = ppdFindMarkedChoice(ppd, kColorMode);
   if (!mode_choice) {
@@ -262,7 +269,8 @@
 
   if (mode_choice) {
     *color_is_default =
-        base::EqualsCaseInsensitiveASCII(mode_choice->choice, kColor);
+        EqualsCaseInsensitiveASCII(mode_choice->choice, kColor) ||
+        EqualsCaseInsensitiveASCII(mode_choice->choice, kSamsungColorTrue);
   }
   return true;
 }
@@ -296,8 +304,8 @@
   }
   if (marked_choice) {
     *color_is_default =
-        !base::EqualsCaseInsensitiveASCII(marked_choice->choice, kBlack) &&
-        !base::EqualsCaseInsensitiveASCII(marked_choice->choice, kMono);
+        !EqualsCaseInsensitiveASCII(marked_choice->choice, kBlack) &&
+        !EqualsCaseInsensitiveASCII(marked_choice->choice, kMono);
   }
   return true;
 }
@@ -322,8 +330,7 @@
                                 color_mode_option->defchoice);
   }
   if (mode_choice) {
-    *color_is_default =
-        base::EqualsCaseInsensitiveASCII(mode_choice->choice, kColor);
+    *color_is_default = EqualsCaseInsensitiveASCII(mode_choice->choice, kColor);
   }
   return true;
 }
@@ -353,7 +360,7 @@
 
   if (mode_choice) {
     *color_is_default =
-        !base::EqualsCaseInsensitiveASCII(mode_choice->choice, kGreyscale);
+        !EqualsCaseInsensitiveASCII(mode_choice->choice, kGreyscale);
   }
   return true;
 }