diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 03:51:25 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-02 03:51:25 +0000 |
| commit | 78c3e681adfdb9c33a61150f471ba1749e5e7182 (patch) | |
| tree | 0079888224cebc5e39a62f50c096fa84cc342bac /chrome/common/ipc_sync_message.h | |
| parent | 2f5e746560e7e557d844863bcc40bd09476f5189 (diff) | |
| download | chromium_src-78c3e681adfdb9c33a61150f471ba1749e5e7182.zip chromium_src-78c3e681adfdb9c33a61150f471ba1749e5e7182.tar.gz chromium_src-78c3e681adfdb9c33a61150f471ba1749e5e7182.tar.bz2 | |
We have a bunch of new ui_tests failures. I want
to check if this change (6181) was the cause. I'm
reverting.
TBR:jeremy
Review URL: http://codereview.chromium.org/12856
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6199 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, 1 insertions, 8 deletions
diff --git a/chrome/common/ipc_sync_message.h b/chrome/common/ipc_sync_message.h index 116e6c7..86cb62f 100644 --- a/chrome/common/ipc_sync_message.h +++ b/chrome/common/ipc_sync_message.h @@ -5,9 +5,7 @@ #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" @@ -18,7 +16,7 @@ class MessageReplyDeserializer; class SyncMessage : public Message { public: - SyncMessage(int32 routing_id, uint16 type, PriorityValue priority, + SyncMessage(int32 routing_id, WORD type, PriorityValue priority, MessageReplyDeserializer* deserializer); // Call this to get a deserializer for the output parameters. @@ -26,8 +24,6 @@ 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. @@ -48,7 +44,6 @@ 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); @@ -73,9 +68,7 @@ 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 }; |