diff options
| author | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-08 09:05:45 +0000 |
|---|---|---|
| committer | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-08 09:05:45 +0000 |
| commit | 53ff43df9a2ff62a3ccdffe019aba0ba086f077a (patch) | |
| tree | 217cb492058f6448c50089488381a83232341391 /printing/backend/print_backend.h | |
| parent | 1e4771760a9244d2cef1c544299b976b9f940d12 (diff) | |
| download | chromium_src-53ff43df9a2ff62a3ccdffe019aba0ba086f077a.zip chromium_src-53ff43df9a2ff62a3ccdffe019aba0ba086f077a.tar.gz chromium_src-53ff43df9a2ff62a3ccdffe019aba0ba086f077a.tar.bz2 | |
Revert of Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes… (https://codereview.chromium.org/321703002/)
Reason for revert:
Didn't fix.
Original issue's description:
> Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes… (https://codereview.chromium.org/324523002/)
>
> Reason for revert:
> Breaks Linux ASAN http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%281%29/builds/2865
>
> Original issue's description:
> > Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes reporting for all platforms.
> >
> > BUG=239879
> > NOTRY=true
> >
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275646
> >
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275716
>
> TBR=vitalybuka@chromium.org,jschuh@chromium.org,alekseys@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=239879
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275739
TBR=vitalybuka@chromium.org,jschuh@chromium.org,alekseys@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=239879
Review URL: https://codereview.chromium.org/318293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend/print_backend.h')
| -rw-r--r-- | printing/backend/print_backend.h | 10 |
1 files changed, 0 insertions, 10 deletions
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 { |