| 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 557fbb4a01765f196e5b433dacfb18d0576bfb0d..e952484d73b5e939cc6ef29d616a55dffb96c383 100644
|
| --- a/chrome/browser/printing/print_dialog_gtk.cc
|
| +++ b/chrome/browser/printing/print_dialog_gtk.cc
|
| @@ -28,12 +28,6 @@ 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";
|
| -
|
| // CUPS Duplex attribute and values.
|
| const char kCUPSDuplex[] = "cups-Duplex";
|
| const char kDuplexNone[] = "None";
|
| @@ -193,19 +187,11 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
|
| gtk_print_settings_set_n_copies(gtk_settings_, copies);
|
| gtk_print_settings_set_collate(gtk_settings_, collate);
|
|
|
| - 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);
|
| + std::string color_value;
|
| + std::string color_setting_name;
|
| + printing::GetColorModelForMode(color, &color_setting_name, &color_value);
|
| + gtk_print_settings_set(gtk_settings_, color_setting_name.c_str(),
|
| + color_value.c_str());
|
|
|
| if (duplex_mode != printing::UNKNOWN_DUPLEX_MODE) {
|
| const char* cups_duplex_mode = NULL;
|
|
|