diff options
| author | morrita <morrita@chromium.org> | 2015-01-14 13:17:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 21:18:13 +0000 |
| commit | 4b5c28e2f3e3400b5e91129704368845688d40fe (patch) | |
| tree | 05153a3c5801cff71baa7ce754b1353e061f47d4 /ipc/ipc_message_utils.cc | |
| parent | 81b9425c45c6ec20805385070ee69085c2cc426a (diff) | |
| download | chromium_src-4b5c28e2f3e3400b5e91129704368845688d40fe.zip chromium_src-4b5c28e2f3e3400b5e91129704368845688d40fe.tar.gz chromium_src-4b5c28e2f3e3400b5e91129704368845688d40fe.tar.bz2 | |
IPC: Generalize FileDescriptorSet to MessageAttachmentSet
This is a preparation for crbug.com/448190, where we're going
to allow Mojo MessagePipe being sent over Chrome IPC.
The plan is that we'll extend existing FileDescriptorSet to
carry both platform handles and Mojo's MessagePipes, then
let ChannelMojo take care of these handles.
As the first step, this change renames FileDescriptorSet to
MessageAttachmentSet and moves it out from the OS_POSIX guard.
Although this change doesn't do anything significant, we'll
generalize it to carry both platform files and mojo handles
eventually.
R=agl@chromium.org, viettrungluu@chromium.org
BUG=448190
Review URL: https://codereview.chromium.org/835873004
Cr-Commit-Position: refs/heads/master@{#311546}
Diffstat (limited to 'ipc/ipc_message_utils.cc')
| -rw-r--r-- | ipc/ipc_message_utils.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index b6e292f..9f15177 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -13,10 +13,9 @@ #include "base/time/time.h" #include "base/values.h" #include "ipc/ipc_channel_handle.h" +#include "ipc/ipc_message_attachment_set.h" -#if defined(OS_POSIX) -#include "ipc/file_descriptor_set_posix.h" -#elif defined(OS_WIN) +#if defined(OS_WIN) #include <tchar.h> #endif |