diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 18:29:36 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 18:29:36 +0000 |
| commit | 6766b170698ebf9dfdf6972e937aea7d60f2a713 (patch) | |
| tree | 6fa94a46702e89011e7d1096f69d349768f6bbdb /ipc | |
| parent | 088c4d0895fcc1ae30fe988057ab7866be303d74 (diff) | |
| download | chromium_src-6766b170698ebf9dfdf6972e937aea7d60f2a713.zip chromium_src-6766b170698ebf9dfdf6972e937aea7d60f2a713.tar.gz chromium_src-6766b170698ebf9dfdf6972e937aea7d60f2a713.tar.bz2 | |
Get rid of a bunch of view_messages.h includes from chrome by making the TabContentsObserver interface not use a struct from it. Instead, the interface uses a new struct, content::FrameNavigateParams, that's in the public directory. The IPC message's struct derives from it.
BUG=98716
Review URL: http://codereview.chromium.org/8603015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_message_macros.h | 4 | ||||
| -rw-r--r-- | ipc/ipc_message_null_macros.h | 2 | ||||
| -rw-r--r-- | ipc/param_traits_log_macros.h | 3 | ||||
| -rw-r--r-- | ipc/param_traits_read_macros.h | 3 | ||||
| -rw-r--r-- | ipc/param_traits_write_macros.h | 3 | ||||
| -rw-r--r-- | ipc/struct_constructor_macros.h | 3 | ||||
| -rw-r--r-- | ipc/struct_destructor_macros.h | 3 |
7 files changed, 20 insertions, 1 deletions
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index 27fcf83..783108e 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -191,10 +191,12 @@ // Macros for defining structs. May be subsequently redefined. #define IPC_STRUCT_BEGIN(struct_name) \ + IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, IPC::NoParams) +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ struct struct_name; \ IPC_STRUCT_TRAITS_BEGIN(struct_name) \ IPC_STRUCT_TRAITS_END() \ - struct IPC_MESSAGE_EXPORT struct_name : IPC::NoParams { \ + struct IPC_MESSAGE_EXPORT struct_name : parent { \ struct_name(); \ ~struct_name(); #define IPC_STRUCT_MEMBER(type, name) type name; diff --git a/ipc/ipc_message_null_macros.h b/ipc/ipc_message_null_macros.h index 7cd02f5..12d9e6e 100644 --- a/ipc/ipc_message_null_macros.h +++ b/ipc/ipc_message_null_macros.h @@ -7,6 +7,7 @@ // NULL out all the macros that need NULLing, so that multiple includes of // the XXXX_messages_internal.h files will not generate noise. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END #undef IPC_STRUCT_TRAITS_BEGIN @@ -17,6 +18,7 @@ #undef IPC_MESSAGE_DECL #define IPC_STRUCT_BEGIN(struct_name) +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) #define IPC_STRUCT_MEMBER(type, name) #define IPC_STRUCT_END() #define IPC_STRUCT_TRAITS_BEGIN(struct_name) diff --git a/ipc/param_traits_log_macros.h b/ipc/param_traits_log_macros.h index 8259a0d..b2d1f2e 100644 --- a/ipc/param_traits_log_macros.h +++ b/ipc/param_traits_log_macros.h @@ -13,8 +13,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/param_traits_read_macros.h b/ipc/param_traits_read_macros.h index f0b88bc..a78c880 100644 --- a/ipc/param_traits_read_macros.h +++ b/ipc/param_traits_read_macros.h @@ -11,8 +11,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/param_traits_write_macros.h b/ipc/param_traits_write_macros.h index 844c385..c83d6b0 100644 --- a/ipc/param_traits_write_macros.h +++ b/ipc/param_traits_write_macros.h @@ -11,8 +11,11 @@ // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() diff --git a/ipc/struct_constructor_macros.h b/ipc/struct_constructor_macros.h index 67bfcfb..ee056a3 100644 --- a/ipc/struct_constructor_macros.h +++ b/ipc/struct_constructor_macros.h @@ -10,9 +10,12 @@ // Set up so next include will generate constructors. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT #undef IPC_STRUCT_MEMBER #undef IPC_STRUCT_END #define IPC_STRUCT_BEGIN(struct_name) struct_name::struct_name() : NoParams() +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + struct_name::struct_name() : parent() #define IPC_STRUCT_MEMBER(type, name) , name() #define IPC_STRUCT_END() {} diff --git a/ipc/struct_destructor_macros.h b/ipc/struct_destructor_macros.h index bf3dc95..13fce2d 100644 --- a/ipc/struct_destructor_macros.h +++ b/ipc/struct_destructor_macros.h @@ -10,6 +10,9 @@ // Set up so next include will generate destructors. #undef IPC_STRUCT_BEGIN +#undef IPC_STRUCT_BEGIN_WITH_PARENT +#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent) \ + IPC_STRUCT_BEGIN(struct_name) #define IPC_STRUCT_BEGIN(struct_name) struct_name::~struct_name() {} #endif // IPC_STRUCT_DESTRUCTOR_MACROS_H_ |