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

chrome/common/chrome_utility_messages.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.
 
 // Multiply-included message file, so no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 30 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(to)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults)
   IPC_STRUCT_TRAITS_MEMBER(printer_capabilities)
   IPC_STRUCT_TRAITS_MEMBER(caps_mime_type)
   IPC_STRUCT_TRAITS_MEMBER(printer_defaults)
   IPC_STRUCT_TRAITS_MEMBER(defaults_mime_type)
 IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS_MAX_VALUE(printing::ColorModel, printing::PROCESSCOLORMODEL_RGB)
-IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE)
+IPC_ENUM_TRAITS(printing::DuplexMode)
 
+#if defined(OS_WIN)
 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(size_um)
 IPC_STRUCT_TRAITS_END()
+#endif
 
 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults)
   IPC_STRUCT_TRAITS_MEMBER(collate_capable)
   IPC_STRUCT_TRAITS_MEMBER(collate_default)
   IPC_STRUCT_TRAITS_MEMBER(copies_capable)
   IPC_STRUCT_TRAITS_MEMBER(duplex_capable)
   IPC_STRUCT_TRAITS_MEMBER(duplex_default)
   IPC_STRUCT_TRAITS_MEMBER(color_changeable)
   IPC_STRUCT_TRAITS_MEMBER(color_default)
+#if defined(USE_CUPS)
   IPC_STRUCT_TRAITS_MEMBER(color_model)
   IPC_STRUCT_TRAITS_MEMBER(bw_model)
+#endif
+#if defined(OS_WIN)
   IPC_STRUCT_TRAITS_MEMBER(papers)
   IPC_STRUCT_TRAITS_MEMBER(default_paper)
   IPC_STRUCT_TRAITS_MEMBER(dpis)
   IPC_STRUCT_TRAITS_MEMBER(default_dpi)
+#endif
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS(printing::PwgRasterTransformType);
 
 IPC_STRUCT_TRAITS_BEGIN(printing::PwgRasterSettings)
   IPC_STRUCT_TRAITS_MEMBER(odd_page_transform)
   IPC_STRUCT_TRAITS_MEMBER(rotate_all_pages)
   IPC_STRUCT_TRAITS_MEMBER(reverse_page_order)
 IPC_STRUCT_TRAITS_END()
 
@@ skipping 435 matching lines @@
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials,
                      std::string /* ssid */,
                      std::vector<uint8> /* public_key */)
 
 // Reply after getting WiFi credentials from the system and encrypting them with
 // caller's public key. |success| is false if error occurred.
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotEncryptedWiFiCredentials,
                      std::vector<uint8> /* encrypted_key_data */,
                      bool /* success */)
 #endif  // defined(OS_WIN)