Chromium Code Reviews| Index: components/printing/common/printing_param_traits_macros.h |
| diff --git a/components/printing/common/printing_param_traits_macros.h b/components/printing/common/printing_param_traits_macros.h |
| index 3ce6d9cb192cd0405d1ef7837668a075d8412d99..01b7478ec3434ea1eba814fdb9ff9bc0a52760af 100644 |
| --- a/components/printing/common/printing_param_traits_macros.h |
| +++ b/components/printing/common/printing_param_traits_macros.h |
| @@ -2,22 +2,72 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -// Singly or multiply-included shared traits file depending on circumstances. |
| -// This allows the use of printing IPC serialization macros in more than one IPC |
| -// message file. |
| #ifndef COMPONENTS_PRINTING_COMMON_PRINTING_PARAM_TRAITS_MACROS_H_ |
| #define COMPONENTS_PRINTING_COMMON_PRINTING_PARAM_TRAITS_MACROS_H_ |
| +#include <string> |
| +#include <vector> |
| + |
| +#include "base/strings/string16.h" |
| +#include "build/build_config.h" |
| #include "ipc/ipc_message_macros.h" |
| +#include "ipc/ipc_platform_file.h" |
|
Sam McNally
2017/01/05 06:23:15
Remove?
tibell
2017/01/12 03:30:15
Done.
|
| +#include "printing/backend/print_backend.h" |
| +#include "printing/features/features.h" |
| +#include "printing/page_range.h" |
| +#include "printing/pdf_render_settings.h" |
| #include "printing/print_job_constants.h" |
| +#include "printing/pwg_raster_settings.h" |
| + |
| +#if defined(OS_WIN) |
| +#include <windows.h> |
| +#endif |
| -// TODO(dgn) move all those macros back to |
| -// components/printing/common/print_messages.h when they can be handled by a |
| -// single generator. (main tracking bug: crbug.com/450822) |
| IPC_ENUM_TRAITS_MAX_VALUE(printing::MarginType, |
| printing::MARGIN_TYPE_LAST) |
| + |
| IPC_ENUM_TRAITS_MIN_MAX_VALUE(printing::DuplexMode, |
| printing::UNKNOWN_DUPLEX_MODE, |
| printing::SHORT_EDGE) |
| +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_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper) |
| + IPC_STRUCT_TRAITS_MEMBER(display_name) |
| + IPC_STRUCT_TRAITS_MEMBER(vendor_id) |
| + IPC_STRUCT_TRAITS_MEMBER(size_um) |
| +IPC_STRUCT_TRAITS_END() |
| + |
| +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) |
| + IPC_STRUCT_TRAITS_MEMBER(color_model) |
| + IPC_STRUCT_TRAITS_MEMBER(bw_model) |
| + IPC_STRUCT_TRAITS_MEMBER(papers) |
| + IPC_STRUCT_TRAITS_MEMBER(default_paper) |
| + IPC_STRUCT_TRAITS_MEMBER(dpis) |
| + IPC_STRUCT_TRAITS_MEMBER(default_dpi) |
| +IPC_STRUCT_TRAITS_END() |
| + |
| +IPC_ENUM_TRAITS_MAX_VALUE(printing::PwgRasterTransformType, |
| + printing::TRANSFORM_TYPE_LAST) |
| + |
| +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() |
| + |
| #endif // COMPONENTS_PRINTING_COMMON_PRINTING_PARAM_TRAITS_MACROS_H_ |