content/common/content_param_traits_macros.h - Issue 370833002: Move resource_type.* from webkit/ to content/.

Side by Side Diff: content/common/content_param_traits_macros.h

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos fix Created 6 years, 5 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

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_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_	8 #ifndef CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_

9 #define CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_	9 #define CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_

10	10

11 #include "content/common/content_export.h"	11 #include "content/common/content_export.h"

	12 #include "content/public/common/resource_type.h"

12 #include "ipc/ipc_message_macros.h"	13 #include "ipc/ipc_message_macros.h"

13 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"	14 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"

14 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"	15 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"

15 #include "third_party/WebKit/public/web/WebInputEvent.h"	16 #include "third_party/WebKit/public/web/WebInputEvent.h"

16 #include "third_party/WebKit/public/web/WebPageVisibilityState.h"	17 #include "third_party/WebKit/public/web/WebPageVisibilityState.h"

17 #include "webkit/common/resource_type.h"

18	18

19 #undef IPC_MESSAGE_EXPORT	19 #undef IPC_MESSAGE_EXPORT

20 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	20 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

21	21

22 IPC_ENUM_TRAITS_MAX_VALUE(ResourceType::Type, ResourceType::LAST_TYPE - 1)	22 IPC_ENUM_TRAITS_MAX_VALUE(content::ResourceType::Type,

	23 content::ResourceType::LAST_TYPE - 1)

23 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContentSecurityPolicyType,	24 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContentSecurityPolicyType,

24 blink::WebContentSecurityPolicyTypeLast)	25 blink::WebContentSecurityPolicyTypeLast)

25 IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type,	26 IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type,

26 blink::WebInputEvent::TypeFirst,	27 blink::WebInputEvent::TypeFirst,

27 blink::WebInputEvent::TypeLast)	28 blink::WebInputEvent::TypeLast)

28 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebPageVisibilityState,	29 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebPageVisibilityState,

29 blink::WebPageVisibilityStateLast)	30 blink::WebPageVisibilityStateLast)

30	31

31 IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline)	32 IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline)

32 IPC_STRUCT_TRAITS_MEMBER(startOffset)	33 IPC_STRUCT_TRAITS_MEMBER(startOffset)

33 IPC_STRUCT_TRAITS_MEMBER(endOffset)	34 IPC_STRUCT_TRAITS_MEMBER(endOffset)

34 IPC_STRUCT_TRAITS_MEMBER(color)	35 IPC_STRUCT_TRAITS_MEMBER(color)

35 IPC_STRUCT_TRAITS_MEMBER(thick)	36 IPC_STRUCT_TRAITS_MEMBER(thick)

36 IPC_STRUCT_TRAITS_MEMBER(backgroundColor)	37 IPC_STRUCT_TRAITS_MEMBER(backgroundColor)

37 IPC_STRUCT_TRAITS_END()	38 IPC_STRUCT_TRAITS_END()

38	39

39 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_	40 #endif // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_

OLD	NEW

« no previous file with comments | « content/child/site_isolation_policy.h ('k') | content/common/resource_messages.h » ('j') | content/public/common/resource_type.h » ('J')