Better detect options for Brother CUPS printers.

printing/print_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/print_settings.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "printing/print_job_constants.h"
@@ skipping 84 matching lines @@
       color_value->assign(kCMYK);
       break;
     case PROCESSCOLORMODEL_GREYSCALE:
       color_setting_name->assign(kCUPSProcessColorModel);
       color_value->assign(kGreyscale);
       break;
     case PROCESSCOLORMODEL_RGB:
       color_setting_name->assign(kCUPSProcessColorModel);
       color_value->assign(kRGB);
       break;
+    case BROTHER_COLOR_COLOR:
+      color_value->assign(kColor);
+      break;
+    case BROTHER_COLOR_BLACK:
+      color_value->assign(kBlack);
+      break;
     default:
       color_value->assign(kGrayscale);
       break;
   }
 }
 #endif  // defined(USE_CUPS)
 
 bool IsColorModelSelected(int color_mode) {
-  return (color_mode != GRAY &&
-          color_mode != BLACK &&
+  return (color_mode != GRAY && color_mode != BLACK &&
           color_mode != PRINTOUTMODE_NORMAL_GRAY &&
           color_mode != COLORMODE_MONOCHROME &&
           color_mode != PROCESSCOLORMODEL_GREYSCALE &&
-          color_mode != HP_COLOR_BLACK);
+          color_mode != BROTHER_COLOR_BLACK && color_mode != HP_COLOR_BLACK);
 }
 
 // Global SequenceNumber used for generating unique cookie values.
 static base::StaticAtomicSequenceNumber cookie_seq;
 
 PrintSettings::PrintSettings() {
   Clear();
 }
 
 PrintSettings::PrintSettings(const PrintSettings& other) = default;
@@ skipping 114 matching lines @@
 }
 
 void PrintSettings::SetOrientation(bool landscape) {
   if (landscape_ != landscape) {
     landscape_ = landscape;
     page_setup_device_units_.FlipOrientation();
   }
 }
 
 }  // namespace printing