Revert of Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes…

printing/backend/print_backend.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PRINTING_BACKEND_PRINT_BACKEND_H_
 #define PRINTING_BACKEND_PRINT_BACKEND_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
   bool collate_capable;
   bool collate_default;
 
   bool copies_capable;
 
   bool duplex_capable;
   DuplexMode duplex_default;
 
   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 {
   PrinterCapsAndDefaults();
   ~PrinterCapsAndDefaults();
 
   std::string printer_capabilities;
   std::string caps_mime_type;
   std::string printer_defaults;
   std::string defaults_mime_type;
@@ skipping 42 matching lines @@
       const base::DictionaryValue* print_backend_settings);
 
  protected:
   friend class base::RefCountedThreadSafe<PrintBackend>;
   virtual ~PrintBackend();
 };
 
 }  // namespace printing
 
 #endif  // PRINTING_BACKEND_PRINT_BACKEND_H_