diff options
author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 16:43:56 +0000 |
---|---|---|
committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 16:43:56 +0000 |
commit | 540fead9ca2d4c454b7e3461b59f64c911155c6c (patch) | |
tree | 6180cbf97febce531dacb5bd69aea6f608d8be54 /printing/print_settings.cc | |
parent | 8f8146f2af6da72ea93020727f2c712baa71f73b (diff) | |
download | chromium_src-540fead9ca2d4c454b7e3461b59f64c911155c6c.zip chromium_src-540fead9ca2d4c454b7e3461b59f64c911155c6c.tar.gz chromium_src-540fead9ca2d4c454b7e3461b59f64c911155c6c.tar.bz2 |
Revert 105087 - PrintPreview: Fix printer color settings issues based on printer ppd/schema information.
Show/Hide the color options based on printer ppd/schema information. Some printers does not provide sufficient information in the printer schema/ppd regarding the color settings and they use custom advance settings to print in black & white/greyscale. In those cases, users need to print using native dialog in order to set these advance color settings.
BUG=93811, 93490, 87344, 96658, 98768
TEST= Please refer to bug description.
Review URL: http://codereview.chromium.org/8138020
TBR=kmadhusu@chromium.org
Review URL: http://codereview.chromium.org/8245012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/print_settings.cc')
-rw-r--r-- | printing/print_settings.cc | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/printing/print_settings.cc b/printing/print_settings.cc index 06aac453d..d08d02f5 100644 --- a/printing/print_settings.cc +++ b/printing/print_settings.cc @@ -10,102 +10,6 @@ namespace printing { -#if defined (USE_CUPS) -void GetColorModelForMode( - int color_mode, std::string* color_setting_name, std::string* color_value) { -#if defined(OS_MACOSX) - const char kCUPSColorMode[] = "ColorMode"; - const char kCUPSColorModel[] = "ColorModel"; - const char kCUPSPrintoutMode[] = "PrintoutMode"; - const char kCUPSProcessColorModel[] = "ProcessColorModel"; -#else - const char kCUPSColorMode[] = "cups-ColorMode"; - const char kCUPSColorModel[] = "cups-ColorModel"; - const char kCUPSPrintoutMode[] = "cups-PrintoutMode"; - const char kCUPSProcessColorModel[] = "cups-ProcessColorModel"; -#endif - - color_setting_name->assign(kCUPSColorModel); - switch (color_mode) { - case printing::COLOR: - color_value->assign(printing::kColor); - break; - case printing::CMYK: - color_value->assign(printing::kCMYK); - break; - case printing::PRINTOUTMODE_NORMAL: - color_value->assign(printing::kNormal); - color_setting_name->assign(kCUPSPrintoutMode); - break; - case printing::PRINTOUTMODE_NORMAL_GRAY: - color_value->assign(printing::kNormalGray); - color_setting_name->assign(kCUPSPrintoutMode); - break; - case printing::RGB16: - color_value->assign(printing::kRGB16); - break; - case printing::RGBA: - color_value->assign(printing::kRGBA); - break; - case printing::RGB: - color_value->assign(printing::kRGB); - break; - case printing::CMY: - color_value->assign(printing::kCMY); - break; - case printing::CMY_K: - color_value->assign(printing::kCMY_K); - break; - case printing::BLACK: - color_value->assign(printing::kBlack); - break; - case printing::GRAY: - color_value->assign(printing::kGray); - break; - case printing::COLORMODE_COLOR: - color_setting_name->assign(kCUPSColorMode); - color_value->assign(printing::kColor); - break; - case printing::COLORMODE_MONOCHROME: - color_setting_name->assign(kCUPSColorMode); - color_value->assign(printing::kMonochrome); - break; - case printing::HP_COLOR_COLOR: - color_setting_name->assign(kColor); - color_value->assign(printing::kColor); - break; - case printing::HP_COLOR_BLACK: - color_setting_name->assign(kColor); - color_value->assign(printing::kBlack); - break; - case printing::PROCESSCOLORMODEL_CMYK: - color_setting_name->assign(kCUPSProcessColorModel); - color_value->assign(printing::kCMYK); - break; - case printing::PROCESSCOLORMODEL_GREYSCALE: - color_setting_name->assign(kCUPSProcessColorModel); - color_value->assign(printing::kGreyscale); - break; - case printing::PROCESSCOLORMODEL_RGB: - color_setting_name->assign(kCUPSProcessColorModel); - color_value->assign(printing::kRGB); - break; - default: - color_value->assign(printing::kGrayscale); - break; - } -} -#endif - -bool isColorModelSelected(int model) { - return (model != printing::GRAY && - model != printing::BLACK && - model != printing::PRINTOUTMODE_NORMAL_GRAY && - model != printing::COLORMODE_MONOCHROME && - model != printing::PROCESSCOLORMODEL_GREYSCALE && - model != printing::HP_COLOR_BLACK); -} - // Global SequenceNumber used for generating unique cookie values. static base::AtomicSequenceNumber cookie_seq(base::LINKER_INITIALIZED); |