diff options
| author | Trent Apted <tapted@chromium.org> | 2014-10-03 11:51:20 +1000 |
|---|---|---|
| committer | Trent Apted <tapted@chromium.org> | 2014-10-03 01:52:13 +0000 |
| commit | 5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9 (patch) | |
| tree | f4107f31a06d889dc0dcee9cfd2f66d6d2f19575 /mojo/shell/app_child_process.cc | |
| parent | 11cbd199704f82210205e8e956af686e179e2689 (diff) | |
| download | chromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.zip chromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.tar.gz chromium_src-5a14236a9c2a7b9191c31ddccc5f1d7a4f6278a9.tar.bz2 | |
Revert "Move mojo edk into mojo/edk"
This reverts commit ee7ff197a98da4636f33bd713de784948b487bd4.
Causing widespread checkdeps failures.
ERROR in src\content\browser\webui\web_ui_mojo_browsertest.cc
Illegal include: "mojo/edk/test/test_utils.h" Because of no rule applying.
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/623883002
Cr-Commit-Position: refs/heads/master@{#297966}
Diffstat (limited to 'mojo/shell/app_child_process.cc')
| -rw-r--r-- | mojo/shell/app_child_process.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/shell/app_child_process.cc b/mojo/shell/app_child_process.cc index 7bf5420..c288ee3 100644 --- a/mojo/shell/app_child_process.cc +++ b/mojo/shell/app_child_process.cc @@ -19,8 +19,8 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "mojo/common/message_pump_mojo.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/simple_platform_support.h" +#include "mojo/embedder/embedder.h" +#include "mojo/embedder/simple_platform_support.h" #include "mojo/public/cpp/system/core.h" #include "mojo/shell/app_child_process.mojom.h" |