diff options
| author | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:28:58 +0000 |
|---|---|---|
| committer | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:28:58 +0000 |
| commit | 04e21f58317b0e35d3823859622e493884a2aed7 (patch) | |
| tree | 3c676dd836e163ccd4d4b653cc19c7dfdb227d0a /printing | |
| parent | 5fc01f31043d20344360c33321c5cfe9fc0a2281 (diff) | |
| download | chromium_src-04e21f58317b0e35d3823859622e493884a2aed7.zip chromium_src-04e21f58317b0e35d3823859622e493884a2aed7.tar.gz chromium_src-04e21f58317b0e35d3823859622e493884a2aed7.tar.bz2 | |
Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes reporting for all platforms.
BUG=239879
Review URL: https://codereview.chromium.org/324523002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/backend/print_backend.cc | 5 | ||||
| -rw-r--r-- | printing/backend/print_backend.h | 10 | ||||
| -rw-r--r-- | printing/backend/print_backend_win.cc | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc index d071201..fefa789 100644 --- a/printing/backend/print_backend.cc +++ b/printing/backend/print_backend.cc @@ -19,12 +19,9 @@ PrinterSemanticCapsAndDefaults::PrinterSemanticCapsAndDefaults() duplex_capable(false), duplex_default(UNKNOWN_DUPLEX_MODE), color_changeable(false), - color_default(false) -#if defined (OS_POSIX) - , + color_default(false), color_model(UNKNOWN_COLOR_MODEL), bw_model(UNKNOWN_COLOR_MODEL) -#endif {} PrinterSemanticCapsAndDefaults::~PrinterSemanticCapsAndDefaults() {} diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h index 30e4512..3b307f1 100644 --- a/printing/backend/print_backend.h +++ b/printing/backend/print_backend.h @@ -48,28 +48,18 @@ struct PRINTING_EXPORT PrinterSemanticCapsAndDefaults { bool color_changeable; bool color_default; - - // These are CUPS specific data, which soon be removed altogether. They are - // not defined under USE_CUPS to do not pull CUPS dependency into common code. -#if defined(OS_POSIX) - // TODO(alekseys): Resolve color model within printing context, do not expose - // it outside of the context. ColorModel color_model; ColorModel bw_model; -#endif -#if defined(OS_WIN) struct Paper { std::string name; gfx::Size size_um; }; - std::vector<Paper> papers; Paper default_paper; std::vector<gfx::Size> dpis; gfx::Size default_dpi; -#endif }; struct PRINTING_EXPORT PrinterCapsAndDefaults { diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index 75c562a..87c69ee 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -267,6 +267,8 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults( // http://msdn.microsoft.com/en-us/library/windows/desktop/dd183552(v=vs.85).aspx caps.color_changeable = (DeviceCapabilities(name, port, DC_COLORDEVICE, NULL, NULL) == 1); + caps.color_model = printing::COLOR; + caps.bw_model = printing::GRAY; caps.duplex_capable = (DeviceCapabilities(name, port, DC_DUPLEX, NULL, NULL) == 1); |