Convert local printer capabilites to CDD format to unify with cloud printers and PDF printer. This is a necessary step for adding paper size capability to local printers.

BUG=239879

Review URL: https://codereview.chromium.org/313723002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275250 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 9 deletions

diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index 43a2563..30e4512 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 {