diff options
| author | jamesr <jamesr@chromium.org> | 2014-10-02 21:26:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 04:27:07 +0000 |
| commit | a03ae49d253d7d1f517e2f92146a6ba201c78aa6 (patch) | |
| tree | df4eae1239d49490fa4e85d184b9000224a7a31c /content/browser | |
| parent | 24b9789375c3c23d0d10e5197c6a7674946ea44b (diff) | |
| download | chromium_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/browser')
| -rw-r--r-- | content/browser/mojo/mojo_application_host.cc | 2 | ||||
| -rw-r--r-- | content/browser/mojo/mojo_application_host.h | 4 | ||||
| -rw-r--r-- | content/browser/webui/web_ui_mojo_browsertest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc index 3af7974..d6ebf15 100644 --- a/content/browser/mojo/mojo_application_host.cc +++ b/content/browser/mojo/mojo_application_host.cc @@ -7,7 +7,7 @@ #include "content/common/mojo/mojo_messages.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_sender.h" -#include "mojo/embedder/platform_channel_pair.h" +#include "mojo/edk/embedder/platform_channel_pair.h" namespace content { namespace { diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h index 27a43f8..01d1335 100644 --- a/content/browser/mojo/mojo_application_host.h +++ b/content/browser/mojo/mojo_application_host.h @@ -7,8 +7,8 @@ #include "base/process/process_handle.h" #include "content/common/mojo/service_registry_impl.h" -#include "mojo/embedder/channel_init.h" -#include "mojo/embedder/scoped_platform_handle.h" +#include "mojo/edk/embedder/channel_init.h" +#include "mojo/edk/embedder/scoped_platform_handle.h" namespace IPC { class Sender; diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 065bc7a..ff9a4e1 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -26,7 +26,7 @@ #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" -#include "mojo/common/test/test_utils.h" +#include "mojo/edk/test/test_utils.h" #include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/js/bindings/constants.h" |