| 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/password_form.h" |
| 12 #include "content/public/common/security_style.h" | 13 #include "content/public/common/security_style.h" |
| 13 #include "ipc/ipc_message_macros.h" | 14 #include "ipc/ipc_message_macros.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h
" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h
" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
| 17 #include "webkit/forms/password_form.h" | |
| 18 #include "webkit/glue/window_open_disposition.h" | 18 #include "webkit/glue/window_open_disposition.h" |
| 19 #include "webkit/plugins/webplugininfo.h" | 19 #include "webkit/plugins/webplugininfo.h" |
| 20 | 20 |
| 21 #undef IPC_MESSAGE_EXPORT | 21 #undef IPC_MESSAGE_EXPORT |
| 22 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 22 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 23 | 23 |
| 24 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) | 24 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) |
| 25 IPC_ENUM_TRAITS(content::SecurityStyle) | 25 IPC_ENUM_TRAITS(content::SecurityStyle) |
| 26 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy) | 26 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy) |
| 27 IPC_ENUM_TRAITS(WindowOpenDisposition) | 27 IPC_ENUM_TRAITS(WindowOpenDisposition) |
| 28 | 28 |
| 29 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint) | 29 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint) |
| 30 IPC_STRUCT_TRAITS_MEMBER(x) | 30 IPC_STRUCT_TRAITS_MEMBER(x) |
| 31 IPC_STRUCT_TRAITS_MEMBER(y) | 31 IPC_STRUCT_TRAITS_MEMBER(y) |
| 32 IPC_STRUCT_TRAITS_END() | 32 IPC_STRUCT_TRAITS_END() |
| 33 | 33 |
| 34 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect) | 34 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect) |
| 35 IPC_STRUCT_TRAITS_MEMBER(x) | 35 IPC_STRUCT_TRAITS_MEMBER(x) |
| 36 IPC_STRUCT_TRAITS_MEMBER(y) | 36 IPC_STRUCT_TRAITS_MEMBER(y) |
| 37 IPC_STRUCT_TRAITS_MEMBER(width) | 37 IPC_STRUCT_TRAITS_MEMBER(width) |
| 38 IPC_STRUCT_TRAITS_MEMBER(height) | 38 IPC_STRUCT_TRAITS_MEMBER(height) |
| 39 IPC_STRUCT_TRAITS_END() | 39 IPC_STRUCT_TRAITS_END() |
| 40 | 40 |
| 41 IPC_STRUCT_TRAITS_BEGIN(webkit::forms::PasswordForm) | 41 IPC_STRUCT_TRAITS_BEGIN(content::PasswordForm) |
| 42 IPC_STRUCT_TRAITS_MEMBER(signon_realm) | 42 IPC_STRUCT_TRAITS_MEMBER(signon_realm) |
| 43 IPC_STRUCT_TRAITS_MEMBER(origin) | 43 IPC_STRUCT_TRAITS_MEMBER(origin) |
| 44 IPC_STRUCT_TRAITS_MEMBER(action) | 44 IPC_STRUCT_TRAITS_MEMBER(action) |
| 45 IPC_STRUCT_TRAITS_MEMBER(submit_element) | 45 IPC_STRUCT_TRAITS_MEMBER(submit_element) |
| 46 IPC_STRUCT_TRAITS_MEMBER(username_element) | 46 IPC_STRUCT_TRAITS_MEMBER(username_element) |
| 47 IPC_STRUCT_TRAITS_MEMBER(username_value) | 47 IPC_STRUCT_TRAITS_MEMBER(username_value) |
| 48 IPC_STRUCT_TRAITS_MEMBER(password_element) | 48 IPC_STRUCT_TRAITS_MEMBER(password_element) |
| 49 IPC_STRUCT_TRAITS_MEMBER(password_value) | 49 IPC_STRUCT_TRAITS_MEMBER(password_value) |
| 50 IPC_STRUCT_TRAITS_MEMBER(old_password_element) | 50 IPC_STRUCT_TRAITS_MEMBER(old_password_element) |
| 51 IPC_STRUCT_TRAITS_MEMBER(old_password_value) | 51 IPC_STRUCT_TRAITS_MEMBER(old_password_value) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 66 IPC_STRUCT_TRAITS_MEMBER(name) | 66 IPC_STRUCT_TRAITS_MEMBER(name) |
| 67 IPC_STRUCT_TRAITS_MEMBER(path) | 67 IPC_STRUCT_TRAITS_MEMBER(path) |
| 68 IPC_STRUCT_TRAITS_MEMBER(version) | 68 IPC_STRUCT_TRAITS_MEMBER(version) |
| 69 IPC_STRUCT_TRAITS_MEMBER(desc) | 69 IPC_STRUCT_TRAITS_MEMBER(desc) |
| 70 IPC_STRUCT_TRAITS_MEMBER(mime_types) | 70 IPC_STRUCT_TRAITS_MEMBER(mime_types) |
| 71 IPC_STRUCT_TRAITS_MEMBER(type) | 71 IPC_STRUCT_TRAITS_MEMBER(type) |
| 72 IPC_STRUCT_TRAITS_MEMBER(pepper_permissions) | 72 IPC_STRUCT_TRAITS_MEMBER(pepper_permissions) |
| 73 IPC_STRUCT_TRAITS_END() | 73 IPC_STRUCT_TRAITS_END() |
| 74 | 74 |
| 75 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 75 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |