Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(797)

Unified Diff: printing/print_settings.cc

Issue 2739133002: Better detect options for Brother CUPS printers. (Closed)
Patch Set: Fix more color checks Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/print_job_constants.h ('k') | printing/printing_context_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/print_settings.cc
diff --git a/printing/print_settings.cc b/printing/print_settings.cc
index c35863dc9779f4f818c4fa55d09459a116bb8bfa..74d69fb1306e1bad50894ad7c654fb207554a212 100644
--- a/printing/print_settings.cc
+++ b/printing/print_settings.cc
@@ -102,6 +102,12 @@ void GetColorModelForMode(
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;
@@ -110,12 +116,11 @@ void GetColorModelForMode(
#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.
« no previous file with comments | « printing/print_job_constants.h ('k') | printing/printing_context_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698