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

Unified Diff: printing/backend/print_backend.h

Issue 313723002: Convert local printer capabilites to CDD format to unify with cloud printers and PDF printer. This … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix clang reported errors. 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 | « printing/backend/cups_helper_unittest.cc ('k') | printing/backend/print_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/print_backend.h
diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index 43a2563704271aa2abb74655146763d2229491cc..30e451221a0e571dbb03d91666978d302b30a920 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -38,20 +38,27 @@ struct PRINTING_EXPORT PrinterSemanticCapsAndDefaults {
PrinterSemanticCapsAndDefaults();
~PrinterSemanticCapsAndDefaults();
+ bool collate_capable;
+ bool collate_default;
+
+ bool copies_capable;
+
+ bool duplex_capable;
+ DuplexMode duplex_default;
+
bool color_changeable;
bool color_default;
-#if defined(USE_CUPS)
+ // 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)
- bool collate_capable;
- bool collate_default;
-
- bool copies_capable;
-
struct Paper {
std::string name;
gfx::Size size_um;
@@ -63,9 +70,6 @@ struct PRINTING_EXPORT PrinterSemanticCapsAndDefaults {
std::vector<gfx::Size> dpis;
gfx::Size default_dpi;
#endif
-
- bool duplex_capable;
- DuplexMode duplex_default;
};
struct PRINTING_EXPORT PrinterCapsAndDefaults {
« no previous file with comments | « printing/backend/cups_helper_unittest.cc ('k') | printing/backend/print_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698