diff options
author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 23:48:34 +0000 |
---|---|---|
committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 23:48:34 +0000 |
commit | dc90da2c3f8c87baa8dcea7fbf0272001d771ecf (patch) | |
tree | 99baf8465918e25521eab024315a5aa9ce78734d /chrome/common/ipc_sync_message.h | |
parent | bf1b47dfbe8294738c0db628af036e2fd363ddac (diff) | |
download | chromium_src-dc90da2c3f8c87baa8dcea7fbf0272001d771ecf.zip chromium_src-dc90da2c3f8c87baa8dcea7fbf0272001d771ecf.tar.gz chromium_src-dc90da2c3f8c87baa8dcea7fbf0272001d771ecf.tar.bz2 |
* Add ipc_tests unittest target to xcode project.
* Stub out ipc_channel_posix.cc to allow other code that depends on it to be compiled.
* Cleanup some ipc code a bit to compile on gcc.
* Remove unused IPC::Channel::ProcessPendingMessages()
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/ipc_sync_message.h')
-rw-r--r-- | chrome/common/ipc_sync_message.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/common/ipc_sync_message.h b/chrome/common/ipc_sync_message.h index 86cb62f..116e6c7 100644 --- a/chrome/common/ipc_sync_message.h +++ b/chrome/common/ipc_sync_message.h @@ -5,7 +5,9 @@ #ifndef CHROME_COMMON_IPC_SYNC_MESSAGE_H__ #define CHROME_COMMON_IPC_SYNC_MESSAGE_H__ +#if defined(OS_WIN) #include <windows.h> +#endif #include <string> #include "base/basictypes.h" #include "chrome/common/ipc_message.h" @@ -16,7 +18,7 @@ class MessageReplyDeserializer; class SyncMessage : public Message { public: - SyncMessage(int32 routing_id, WORD type, PriorityValue priority, + SyncMessage(int32 routing_id, uint16 type, PriorityValue priority, MessageReplyDeserializer* deserializer); // Call this to get a deserializer for the output parameters. @@ -24,6 +26,8 @@ class SyncMessage : public Message { // for deleting the deserializer when they're done. MessageReplyDeserializer* GetReplyDeserializer(); +// TODO(playmobil): reimplement on POSIX. +#if defined(OS_WIN) // If this message can cause the receiver to block while waiting for user // input (i.e. by calling MessageBox), then the caller needs to pump window // messages and dispatch asynchronous messages while waiting for the reply. @@ -44,6 +48,7 @@ class SyncMessage : public Message { void EnableMessagePumping(); HANDLE pump_messages_event() const { return pump_messages_event_; } +#endif // defined(OS_WIN) // Returns true if the message is a reply to the given request id. static bool IsMessageReplyTo(const Message& msg, int request_id); @@ -68,7 +73,9 @@ class SyncMessage : public Message { static bool WriteSyncHeader(Message* msg, const SyncHeader& header); MessageReplyDeserializer* deserializer_; +#if defined(OS_WIN) HANDLE pump_messages_event_; +#endif static uint32 next_id_; // for generation of unique ids }; |