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

Unified Diff: trunk/src/printing/backend/print_backend.h

Issue 319373004: Revert 275646 "Generalize printer color model handling, get rid ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « trunk/src/chrome/test/data/webui/print_preview.js ('k') | trunk/src/printing/backend/print_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/printing/backend/print_backend.h
===================================================================
--- trunk/src/printing/backend/print_backend.h (revision 275710)
+++ trunk/src/printing/backend/print_backend.h (working copy)
@@ -48,18 +48,28 @@
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 {
« no previous file with comments | « trunk/src/chrome/test/data/webui/print_preview.js ('k') | trunk/src/printing/backend/print_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698