| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Singly or Multiply-included shared traits file depending on circumstances. | 5 // Singly or Multiply-included shared traits file depending on circumstances. |
| 6 // This allows the use of IPC serialization macros in more than one IPC message | 6 // This allows the use of IPC serialization macros in more than one IPC message |
| 7 // file. | 7 // file. |
| 8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
| 9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
| 10 | 10 |
| 11 #include "content/public/common/console_message_level.h" | 11 #include "content/public/common/console_message_level.h" |
| 12 #include "content/public/common/page_transition_types.h" |
| 12 #include "content/public/common/password_form.h" | 13 #include "content/public/common/password_form.h" |
| 13 #include "content/public/common/security_style.h" | 14 #include "content/public/common/security_style.h" |
| 14 #include "content/public/common/ssl_status.h" | 15 #include "content/public/common/ssl_status.h" |
| 15 #include "ipc/ipc_message_macros.h" | 16 #include "ipc/ipc_message_macros.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" |
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h
" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h
" |
| 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 19 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
| 19 #include "webkit/glue/window_open_disposition.h" | 20 #include "webkit/glue/window_open_disposition.h" |
| 20 #include "webkit/plugins/webplugininfo.h" | 21 #include "webkit/plugins/webplugininfo.h" |
| 21 | 22 |
| 22 #undef IPC_MESSAGE_EXPORT | 23 #undef IPC_MESSAGE_EXPORT |
| 23 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 24 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 24 | 25 |
| 25 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) | 26 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) |
| 27 IPC_ENUM_TRAITS(content::PageTransition) |
| 26 IPC_ENUM_TRAITS(content::SecurityStyle) | 28 IPC_ENUM_TRAITS(content::SecurityStyle) |
| 27 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy) | 29 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy) |
| 28 IPC_ENUM_TRAITS(WindowOpenDisposition) | 30 IPC_ENUM_TRAITS(WindowOpenDisposition) |
| 29 | 31 |
| 30 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint) | 32 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint) |
| 31 IPC_STRUCT_TRAITS_MEMBER(x) | 33 IPC_STRUCT_TRAITS_MEMBER(x) |
| 32 IPC_STRUCT_TRAITS_MEMBER(y) | 34 IPC_STRUCT_TRAITS_MEMBER(y) |
| 33 IPC_STRUCT_TRAITS_END() | 35 IPC_STRUCT_TRAITS_END() |
| 34 | 36 |
| 35 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect) | 37 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect) |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 IPC_STRUCT_TRAITS_MEMBER(name) | 78 IPC_STRUCT_TRAITS_MEMBER(name) |
| 77 IPC_STRUCT_TRAITS_MEMBER(path) | 79 IPC_STRUCT_TRAITS_MEMBER(path) |
| 78 IPC_STRUCT_TRAITS_MEMBER(version) | 80 IPC_STRUCT_TRAITS_MEMBER(version) |
| 79 IPC_STRUCT_TRAITS_MEMBER(desc) | 81 IPC_STRUCT_TRAITS_MEMBER(desc) |
| 80 IPC_STRUCT_TRAITS_MEMBER(mime_types) | 82 IPC_STRUCT_TRAITS_MEMBER(mime_types) |
| 81 IPC_STRUCT_TRAITS_MEMBER(type) | 83 IPC_STRUCT_TRAITS_MEMBER(type) |
| 82 IPC_STRUCT_TRAITS_MEMBER(pepper_permissions) | 84 IPC_STRUCT_TRAITS_MEMBER(pepper_permissions) |
| 83 IPC_STRUCT_TRAITS_END() | 85 IPC_STRUCT_TRAITS_END() |
| 84 | 86 |
| 85 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 87 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |