| 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 22 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
| 23 #include "ui/base/window_open_disposition.h" | 23 #include "ui/base/window_open_disposition.h" |
| 24 #include "webkit/common/webpreferences.h" | 24 #include "webkit/common/webpreferences.h" |
| 25 | 25 |
| 26 #undef IPC_MESSAGE_EXPORT | 26 #undef IPC_MESSAGE_EXPORT |
| 27 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 27 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 28 | 28 |
| 29 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) | 29 IPC_ENUM_TRAITS(content::ConsoleMessageLevel) |
| 30 IPC_ENUM_TRAITS(content::PageTransition) | 30 IPC_ENUM_TRAITS(content::PageTransition) |
| 31 IPC_ENUM_TRAITS(content::SecurityStyle) | 31 IPC_ENUM_TRAITS(content::SecurityStyle) |
| 32 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy) | 32 IPC_ENUM_TRAITS(blink::WebReferrerPolicy) |
| 33 IPC_ENUM_TRAITS(WindowOpenDisposition) | 33 IPC_ENUM_TRAITS(WindowOpenDisposition) |
| 34 IPC_ENUM_TRAITS(webkit_glue::EditingBehavior) | 34 IPC_ENUM_TRAITS(webkit_glue::EditingBehavior) |
| 35 IPC_ENUM_TRAITS(net::RequestPriority) | 35 IPC_ENUM_TRAITS(net::RequestPriority) |
| 36 | 36 |
| 37 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint) | 37 IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint) |
| 38 IPC_STRUCT_TRAITS_MEMBER(x) | 38 IPC_STRUCT_TRAITS_MEMBER(x) |
| 39 IPC_STRUCT_TRAITS_MEMBER(y) | 39 IPC_STRUCT_TRAITS_MEMBER(y) |
| 40 IPC_STRUCT_TRAITS_END() | 40 IPC_STRUCT_TRAITS_END() |
| 41 | 41 |
| 42 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect) | 42 IPC_STRUCT_TRAITS_BEGIN(blink::WebRect) |
| 43 IPC_STRUCT_TRAITS_MEMBER(x) | 43 IPC_STRUCT_TRAITS_MEMBER(x) |
| 44 IPC_STRUCT_TRAITS_MEMBER(y) | 44 IPC_STRUCT_TRAITS_MEMBER(y) |
| 45 IPC_STRUCT_TRAITS_MEMBER(width) | 45 IPC_STRUCT_TRAITS_MEMBER(width) |
| 46 IPC_STRUCT_TRAITS_MEMBER(height) | 46 IPC_STRUCT_TRAITS_MEMBER(height) |
| 47 IPC_STRUCT_TRAITS_END() | 47 IPC_STRUCT_TRAITS_END() |
| 48 | 48 |
| 49 IPC_STRUCT_TRAITS_BEGIN(content::SSLStatus) | 49 IPC_STRUCT_TRAITS_BEGIN(content::SSLStatus) |
| 50 IPC_STRUCT_TRAITS_MEMBER(security_style) | 50 IPC_STRUCT_TRAITS_MEMBER(security_style) |
| 51 IPC_STRUCT_TRAITS_MEMBER(cert_id) | 51 IPC_STRUCT_TRAITS_MEMBER(cert_id) |
| 52 IPC_STRUCT_TRAITS_MEMBER(cert_status) | 52 IPC_STRUCT_TRAITS_MEMBER(cert_status) |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 IPC_STRUCT_TRAITS_MEMBER(wide_viewport_quirk) | 188 IPC_STRUCT_TRAITS_MEMBER(wide_viewport_quirk) |
| 189 IPC_STRUCT_TRAITS_MEMBER(use_wide_viewport) | 189 IPC_STRUCT_TRAITS_MEMBER(use_wide_viewport) |
| 190 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_layout_size_quirk) | 190 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_layout_size_quirk) |
| 191 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_merge_content_quirk) | 191 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_merge_content_quirk) |
| 192 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_zero_values_quirk) | 192 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_zero_values_quirk) |
| 193 IPC_STRUCT_TRAITS_MEMBER(ignore_main_frame_overflow_hidden_quirk) | 193 IPC_STRUCT_TRAITS_MEMBER(ignore_main_frame_overflow_hidden_quirk) |
| 194 IPC_STRUCT_TRAITS_MEMBER(report_screen_size_in_physical_pixels_quirk) | 194 IPC_STRUCT_TRAITS_MEMBER(report_screen_size_in_physical_pixels_quirk) |
| 195 #endif | 195 #endif |
| 196 IPC_STRUCT_TRAITS_END() | 196 IPC_STRUCT_TRAITS_END() |
| 197 | 197 |
| 198 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebWindowFeatures) | 198 IPC_STRUCT_TRAITS_BEGIN(blink::WebWindowFeatures) |
| 199 IPC_STRUCT_TRAITS_MEMBER(x) | 199 IPC_STRUCT_TRAITS_MEMBER(x) |
| 200 IPC_STRUCT_TRAITS_MEMBER(xSet) | 200 IPC_STRUCT_TRAITS_MEMBER(xSet) |
| 201 IPC_STRUCT_TRAITS_MEMBER(y) | 201 IPC_STRUCT_TRAITS_MEMBER(y) |
| 202 IPC_STRUCT_TRAITS_MEMBER(ySet) | 202 IPC_STRUCT_TRAITS_MEMBER(ySet) |
| 203 IPC_STRUCT_TRAITS_MEMBER(width) | 203 IPC_STRUCT_TRAITS_MEMBER(width) |
| 204 IPC_STRUCT_TRAITS_MEMBER(widthSet) | 204 IPC_STRUCT_TRAITS_MEMBER(widthSet) |
| 205 IPC_STRUCT_TRAITS_MEMBER(height) | 205 IPC_STRUCT_TRAITS_MEMBER(height) |
| 206 IPC_STRUCT_TRAITS_MEMBER(heightSet) | 206 IPC_STRUCT_TRAITS_MEMBER(heightSet) |
| 207 IPC_STRUCT_TRAITS_MEMBER(menuBarVisible) | 207 IPC_STRUCT_TRAITS_MEMBER(menuBarVisible) |
| 208 IPC_STRUCT_TRAITS_MEMBER(statusBarVisible) | 208 IPC_STRUCT_TRAITS_MEMBER(statusBarVisible) |
| 209 IPC_STRUCT_TRAITS_MEMBER(toolBarVisible) | 209 IPC_STRUCT_TRAITS_MEMBER(toolBarVisible) |
| 210 IPC_STRUCT_TRAITS_MEMBER(locationBarVisible) | 210 IPC_STRUCT_TRAITS_MEMBER(locationBarVisible) |
| 211 IPC_STRUCT_TRAITS_MEMBER(scrollbarsVisible) | 211 IPC_STRUCT_TRAITS_MEMBER(scrollbarsVisible) |
| 212 IPC_STRUCT_TRAITS_MEMBER(resizable) | 212 IPC_STRUCT_TRAITS_MEMBER(resizable) |
| 213 IPC_STRUCT_TRAITS_MEMBER(fullscreen) | 213 IPC_STRUCT_TRAITS_MEMBER(fullscreen) |
| 214 IPC_STRUCT_TRAITS_MEMBER(dialog) | 214 IPC_STRUCT_TRAITS_MEMBER(dialog) |
| 215 IPC_STRUCT_TRAITS_END() | 215 IPC_STRUCT_TRAITS_END() |
| 216 | 216 |
| 217 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ | 217 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |