content/public/common/common_param_traits_macros.h - Issue 12321055: Revert 183382

Side by Side Diff: content/public/common/common_param_traits_macros.h

Issue 12321055: Revert 183382 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1418/src/

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

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/page_transition_types.h"

13 #include "content/public/common/password_form.h"	13 #include "content/public/common/password_form.h"

14 #include "content/public/common/security_style.h"	14 #include "content/public/common/security_style.h"

15 #include "content/public/common/ssl_status.h"	15 #include "content/public/common/ssl_status.h"

16 #include "ipc/ipc_message_macros.h"	16 #include "ipc/ipc_message_macros.h"

17 #include "net/base/request_priority.h"

18 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"	17 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"

19 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"	18 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"

20 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h "	19 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h "

21 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"	20 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"

22 #include "ui/base/window_open_disposition.h"	21 #include "ui/base/window_open_disposition.h"

23 #include "webkit/glue/webpreferences.h"	22 #include "webkit/glue/webpreferences.h"

24 #include "webkit/plugins/webplugininfo.h"	23 #include "webkit/plugins/webplugininfo.h"

25	24

26 #undef IPC_MESSAGE_EXPORT	25 #undef IPC_MESSAGE_EXPORT

27 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	26 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

28	27

29 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)	28 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)

30 IPC_ENUM_TRAITS(content::PageTransition)	29 IPC_ENUM_TRAITS(content::PageTransition)

31 IPC_ENUM_TRAITS(content::SecurityStyle)	30 IPC_ENUM_TRAITS(content::SecurityStyle)

32 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)	31 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)

33 IPC_ENUM_TRAITS(WindowOpenDisposition)	32 IPC_ENUM_TRAITS(WindowOpenDisposition)

34 IPC_ENUM_TRAITS(webkit_glue::WebPreferences::EditingBehavior)	33 IPC_ENUM_TRAITS(webkit_glue::WebPreferences::EditingBehavior)

35 IPC_ENUM_TRAITS(content::PasswordForm::Type)	34 IPC_ENUM_TRAITS(content::PasswordForm::Type)

36 IPC_ENUM_TRAITS(net::RequestPriority)	35 IPC_ENUM_TRAITS(WebKit::WebURLRequest::Priority)

37	36

38 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint)	37 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint)

39 IPC_STRUCT_TRAITS_MEMBER(x)	38 IPC_STRUCT_TRAITS_MEMBER(x)

40 IPC_STRUCT_TRAITS_MEMBER(y)	39 IPC_STRUCT_TRAITS_MEMBER(y)

41 IPC_STRUCT_TRAITS_END()	40 IPC_STRUCT_TRAITS_END()

42	41

43 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)	42 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)

44 IPC_STRUCT_TRAITS_MEMBER(x)	43 IPC_STRUCT_TRAITS_MEMBER(x)

45 IPC_STRUCT_TRAITS_MEMBER(y)	44 IPC_STRUCT_TRAITS_MEMBER(y)

46 IPC_STRUCT_TRAITS_MEMBER(width)	45 IPC_STRUCT_TRAITS_MEMBER(width)

(...skipping 157 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
204 IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)	203 IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)

205 IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)	204 IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)

206 #if defined(OS_ANDROID)	205 #if defined(OS_ANDROID)

207 IPC_STRUCT_TRAITS_MEMBER(text_autosizing_enabled)	206 IPC_STRUCT_TRAITS_MEMBER(text_autosizing_enabled)

208 IPC_STRUCT_TRAITS_MEMBER(font_scale_factor)	207 IPC_STRUCT_TRAITS_MEMBER(font_scale_factor)

209 IPC_STRUCT_TRAITS_MEMBER(force_enable_zoom)	208 IPC_STRUCT_TRAITS_MEMBER(force_enable_zoom)

210 #endif	209 #endif

211 IPC_STRUCT_TRAITS_END()	210 IPC_STRUCT_TRAITS_END()

212	211

213 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_	212 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_

OLD	NEW