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

Unified Diff: chrome/browser/printing/print_dialog_gtk.cc

Issue 7826040: PrintPreview: Fixed RICOH MP C3501 color print job issues. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 9 years, 3 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 | « no previous file | chrome/browser/resources/print_preview/color_settings.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_dialog_gtk.cc
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 3e803edff28f33be2afe1720e1c4c24da6e4342e..4c3bb828199fc00e5a1fcc8616b5fcd6c3ddadd2 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -29,6 +29,7 @@ using printing::PrintSettings;
namespace {
// CUPS ColorModel attribute and values.
+const char kCMYK[] = "CMYK";
const char kCUPSColorModel[] = "cups-ColorModel";
const char kColor[] = "Color";
const char kGrayscale[] = "Grayscale";
@@ -157,7 +158,7 @@ void PrintDialogGtk::UseDefaultSettings() {
bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
const printing::PageRanges& ranges) {
bool collate;
- bool color;
+ int color;
bool landscape;
bool print_to_pdf;
int copies;
@@ -166,7 +167,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
if (!settings.GetBoolean(printing::kSettingLandscape, &landscape) ||
!settings.GetBoolean(printing::kSettingCollate, &collate) ||
- !settings.GetBoolean(printing::kSettingColor, &color) ||
+ !settings.GetInteger(printing::kSettingColor, &color) ||
!settings.GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf) ||
!settings.GetInteger(printing::kSettingDuplexMode, &duplex_mode) ||
!settings.GetInteger(printing::kSettingCopies, &copies) ||
@@ -184,8 +185,21 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
}
gtk_print_settings_set_n_copies(gtk_settings_, copies);
gtk_print_settings_set_collate(gtk_settings_, collate);
- gtk_print_settings_set(gtk_settings_, kCUPSColorModel,
- color ? kColor : kGrayscale);
+
+ const char* color_mode;
+ switch (color) {
+ case printing::COLOR:
+ color_mode = kColor;
+ break;
+ case printing::CMYK:
+ color_mode = kCMYK;
+ break;
+ default:
+ color_mode = kGrayscale;
+ break;
+ }
+ gtk_print_settings_set(gtk_settings_, kCUPSColorModel, color_mode);
+
const char* cups_duplex_mode;
switch (duplex_mode) {
case printing::LONG_EDGE:
« no previous file with comments | « no previous file | chrome/browser/resources/print_preview/color_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698