summaryrefslogtreecommitdiffstats
path: root/content/child/mojo/mojo_application.h
diff options
context:
space:
mode:
authorjamesr <jamesr@chromium.org>2014-10-02 21:26:48 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 04:27:07 +0000
commita03ae49d253d7d1f517e2f92146a6ba201c78aa6 (patch)
treedf4eae1239d49490fa4e85d184b9000224a7a31c /content/child/mojo/mojo_application.h
parent24b9789375c3c23d0d10e5197c6a7674946ea44b (diff)
downloadchromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.zip
chromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.tar.gz
chromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.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 TBR=sky@chromium.org for file renames Committed: https://chromium.googlesource.com/chromium/src/+/ee7ff197a98da4636f33bd713de784948b487bd4 Review URL: https://codereview.chromium.org/621153003 Cr-Commit-Position: refs/heads/master@{#297986}
Diffstat (limited to 'content/child/mojo/mojo_application.h')
-rw-r--r--content/child/mojo/mojo_application.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
index d745402..8aee2e8 100644
--- a/content/child/mojo/mojo_application.h
+++ b/content/child/mojo/mojo_application.h
@@ -7,7 +7,7 @@
#include "content/common/mojo/service_registry_impl.h"
#include "ipc/ipc_platform_file.h"
-#include "mojo/embedder/channel_init.h"
+#include "mojo/edk/embedder/channel_init.h"
namespace IPC {
class Message;