diff options
| author | James Robinson <jamesr@chromium.org> | 2014-10-02 17:19:39 -0700 |
|---|---|---|
| committer | James Robinson <jamesr@chromium.org> | 2014-10-03 00:20:26 +0000 |
| commit | ee7ff197a98da4636f33bd713de784948b487bd4 (patch) | |
| tree | bde85518c9be483f1e0a32c98a6dbb5e9b93e62e /ipc/mojo/ipc_channel_mojo.cc | |
| parent | 20894f54fc1460d9f13210b427a077267ebe86ee (diff) | |
| download | chromium_src-ee7ff197a98da4636f33bd713de784948b487bd4.zip chromium_src-ee7ff197a98da4636f33bd713de784948b487bd4.tar.gz chromium_src-ee7ff197a98da4636f33bd713de784948b487bd4.tar.bz2 | |
Move mojo edk into mojo/edk
This creates a mojo/edk directory which contains the "embedder developer
kit" aka the set of code needed to embed mojo code.
mojo/edk/embedder = code from mojo/embedder
mojo/edk/system = code from mojo/system
mojo/edk/test = code used to test the previous two, from mojo/common/test
mojo/edk/ can only depend on mojo/public/, base/ and itself.
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/621153003
Cr-Commit-Position: refs/heads/master@{#297958}
Diffstat (limited to 'ipc/mojo/ipc_channel_mojo.cc')
| -rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 00f5452..d3a9f79 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -10,7 +10,7 @@ #include "ipc/ipc_listener.h" #include "ipc/mojo/ipc_channel_mojo_readers.h" #include "ipc/mojo/ipc_mojo_bootstrap.h" -#include "mojo/embedder/embedder.h" +#include "mojo/edk/embedder/embedder.h" #if defined(OS_POSIX) && !defined(OS_NACL) #include "ipc/file_descriptor_set_posix.h" |