content/public/common/common_param_traits_macros.h - Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base.

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

Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win Created 7 years, 11 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/public/browser/web_contents_observer.h ('k') | ui/base/window_open_disposition.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 "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"	17 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"

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

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

19 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"	20 #include "ui/base/window_open_disposition.h"

20 #include "webkit/glue/webpreferences.h"	21 #include "webkit/glue/webpreferences.h"

21 #include "webkit/glue/window_open_disposition.h"

22 #include "webkit/plugins/webplugininfo.h"	22 #include "webkit/plugins/webplugininfo.h"

23	23

24 #undef IPC_MESSAGE_EXPORT	24 #undef IPC_MESSAGE_EXPORT

25 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	25 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

26	26

27 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)	27 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)

28 IPC_ENUM_TRAITS(content::PageTransition)	28 IPC_ENUM_TRAITS(content::PageTransition)

29 IPC_ENUM_TRAITS(content::SecurityStyle)	29 IPC_ENUM_TRAITS(content::SecurityStyle)

30 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)	30 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)

31 IPC_ENUM_TRAITS(WindowOpenDisposition)	31 IPC_ENUM_TRAITS(WindowOpenDisposition)

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
197 IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)	197 IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)

198 IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)	198 IPC_STRUCT_TRAITS_MEMBER(apply_page_scale_factor_in_compositor)

199 #if defined(OS_ANDROID)	199 #if defined(OS_ANDROID)

200 IPC_STRUCT_TRAITS_MEMBER(text_autosizing_enabled)	200 IPC_STRUCT_TRAITS_MEMBER(text_autosizing_enabled)

201 IPC_STRUCT_TRAITS_MEMBER(font_scale_factor)	201 IPC_STRUCT_TRAITS_MEMBER(font_scale_factor)

202 IPC_STRUCT_TRAITS_MEMBER(force_enable_zoom)	202 IPC_STRUCT_TRAITS_MEMBER(force_enable_zoom)

203 #endif	203 #endif

204 IPC_STRUCT_TRAITS_END()	204 IPC_STRUCT_TRAITS_END()

205	205

206 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_	206 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_

OLD	NEW