diff options
| author | alekseys <alekseys@chromium.org> | 2014-09-17 14:24:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 21:25:14 +0000 |
| commit | 87e022006e0198dd28e93b93ccd1cdaf773442a9 (patch) | |
| tree | 2276229a0c9ca78466b9d6f51bab1477380eaaef /printing | |
| parent | 3749e4e5ae82c3ad4e379d347a115fb2a8ab489b (diff) | |
| download | chromium_src-87e022006e0198dd28e93b93ccd1cdaf773442a9.zip chromium_src-87e022006e0198dd28e93b93ccd1cdaf773442a9.tar.gz chromium_src-87e022006e0198dd28e93b93ccd1cdaf773442a9.tar.bz2 | |
Take PPD and CUPS defaults into account on Mac too.
BUG=413258
Review URL: https://codereview.chromium.org/578493003
Cr-Commit-Position: refs/heads/master@{#295345}
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/backend/cups_helper.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc index 80019f0..c0271b2 100644 --- a/printing/backend/cups_helper.cc +++ b/printing/backend/cups_helper.cc @@ -38,7 +38,6 @@ const char kPageSize[] = "PageSize"; const double kMicronsPerPoint = 10.0f * kHundrethsMMPerInch / kPointsPerInch; -#if !defined(OS_MACOSX) void ParseLpOptions(const base::FilePath& filepath, const std::string& printer_name, int* num_options, cups_option_t** options) { @@ -98,7 +97,6 @@ void ParseLpOptions(const base::FilePath& filepath, void MarkLpOptions(const std::string& printer_name, ppd_file_t** ppd) { cups_option_t* options = NULL; int num_options = 0; - ppdMarkDefaults(*ppd); const char kSystemLpOptionPath[] = "/etc/cups/lpoptions"; const char kUserLpOptionPath[] = ".cups/lpoptions"; @@ -120,7 +118,6 @@ void MarkLpOptions(const std::string& printer_name, ppd_file_t** ppd) { } } } -#endif // !defined(OS_MACOSX) bool GetBasicColorModelSettings(ppd_file_t* ppd, ColorModel* color_model_for_black, @@ -369,11 +366,10 @@ bool ParsePpdCapabilities( << line << ", " << ppdErrorString(ppd_status); return false; } + ppdMarkDefaults(ppd); + MarkLpOptions(printer_name, &ppd); printing::PrinterSemanticCapsAndDefaults caps; -#if !defined(OS_MACOSX) - MarkLpOptions(printer_name, &ppd); -#endif caps.collate_capable = true; caps.collate_default = true; caps.copies_capable = true; |