diff options
| author | jamesr <jamesr@chromium.org> | 2014-11-06 17:24:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 01:25:12 +0000 |
| commit | 60a7dbf7faabe2a3b8caf306d8d2a01bfdcd5b59 (patch) | |
| tree | 6af5c96c653a4f201ef8810fc092bcc59bdb5dc5 /ipc | |
| parent | a204dfe24afa7e007833b996605f818e3e319e08 (diff) | |
| download | chromium_src-60a7dbf7faabe2a3b8caf306d8d2a01bfdcd5b59.zip chromium_src-60a7dbf7faabe2a3b8caf306d8d2a01bfdcd5b59.tar.gz chromium_src-60a7dbf7faabe2a3b8caf306d8d2a01bfdcd5b59.tar.bz2 | |
Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac
This updates the mojo sdk and updates chromium code to match. The most
significant change is updating references to the mojo JS bindings code,
which reshuffled. This part was reviewed separately by hansmuller@ in
https://codereview.chromium.org/693343003/. This also updates ipc/mojo
to reflect changes in ChannelInfo.
R=morrita@chromium.org for ipc/mojo
R=jam@chromium.org for top-level approval of the rest
Review URL: https://codereview.chromium.org/703273002
Cr-Commit-Position: refs/heads/master@{#303149}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.h | 7 | ||||
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo_readers.h | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h index 45d2482..29d5f29 100644 --- a/ipc/mojo/ipc_channel_mojo.h +++ b/ipc/mojo/ipc_channel_mojo.h @@ -15,14 +15,9 @@ #include "ipc/ipc_export.h" #include "ipc/mojo/ipc_message_pipe_reader.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" +#include "mojo/edk/embedder/channel_info_forward.h" #include "mojo/public/cpp/system/core.h" -namespace mojo { -namespace embedder { -struct ChannelInfo; -} -} - namespace IPC { namespace internal { diff --git a/ipc/mojo/ipc_channel_mojo_readers.h b/ipc/mojo/ipc_channel_mojo_readers.h index cadf453c..ffcc08b 100644 --- a/ipc/mojo/ipc_channel_mojo_readers.h +++ b/ipc/mojo/ipc_channel_mojo_readers.h @@ -12,12 +12,6 @@ #include "ipc/mojo/ipc_message_pipe_reader.h" #include "mojo/public/cpp/system/core.h" -namespace mojo { -namespace embedder { -struct ChannelInfo; -} -} - namespace IPC { class ChannelMojo; |