chromium/src
0
Fork 0
Code Activity

Remove printing::PrintingContextChromeos::ColorModeIsColor().

Browse Source 
It is nearly identical and not as complete as
printing::IsColorModelSelected().

Bug: 1069266
Change-Id: I094307d5b679708ab974cfed18033cbbc2e14b2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2140959
Reviewed-by: Sean Kau <skau@chromium.org>
Reviewed-by: Jesse Schettler <jschettler@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758042}
This commit is contained in:
Lei Zhang
2020-04-09 22:09:11 +00:00
committed by Commit Bot
parent f108840354
commit 25d16a19c1
2 changed files with 1 additions and 41 deletions

38
printing/printing_context_chromeos.cc

@ -38,8 +38,7 @@ namespace {
// Convert from a ColorMode setting to a print-color-mode value from PWG 5100.13
const char* GetColorModelForMode(int color_mode) {
const char* mode_string;
base::Optional<bool> is_color =
PrintingContextChromeos::ColorModeIsColor(color_mode);
base::Optional<bool> is_color = IsColorModelSelected(color_mode);
if (is_color.has_value()) {
mode_string = is_color.value() ? CUPS_PRINT_COLOR_MODE_COLOR
: CUPS_PRINT_COLOR_MODE_MONOCHROME;
@ -257,41 +256,6 @@ PrintingContextChromeos::~PrintingContextChromeos() {
ReleaseContext();
}
// static
base::Optional<bool> PrintingContextChromeos::ColorModeIsColor(int color_mode) {
switch (color_mode) {
case COLOR:
case CMYK:
case CMY:
case KCMY:
case CMY_K:
case RGB:
case RGB16:
case RGBA:
case COLORMODE_COLOR:
case BROTHER_CUPS_COLOR:
case BROTHER_BRSCRIPT3_COLOR:
case HP_COLOR_COLOR:
case PRINTOUTMODE_NORMAL:
case PROCESSCOLORMODEL_CMYK:
case PROCESSCOLORMODEL_RGB:
return true;
case GRAY:
case BLACK:
case GRAYSCALE:
case COLORMODE_MONOCHROME:
case BROTHER_CUPS_MONO:
case BROTHER_BRSCRIPT3_BLACK:
case HP_COLOR_BLACK:
case PRINTOUTMODE_NORMAL_GRAY:
case PROCESSCOLORMODEL_GREYSCALE:
return false;
default:
LOG(WARNING) << "Unrecognized color mode.";
return base::nullopt;
}
}
void PrintingContextChromeos::AskUserForSettings(
int max_pages,
bool has_selection,

4
printing/printing_context_chromeos.h

@ -23,10 +23,6 @@ class PRINTING_EXPORT PrintingContextChromeos : public PrintingContext {
explicit PrintingContextChromeos(Delegate* delegate);
~PrintingContextChromeos() override;
// Returns true if the ColorMode setting is a color ColorMode and false if it
// is a monochrome ColorMode.
static base::Optional<bool> ColorModeIsColor(int color_mode);
// PrintingContext implementation.
void AskUserForSettings(int max_pages,
bool has_selection,