| Index: mojo/shell/shell_application_delegate.cc
|
| diff --git a/mojo/shell/shell_application_delegate.cc b/mojo/shell/shell_application_delegate.cc
|
| index 1dbac46037b18232c54243e677e9009374415fee..ec3e9db032d76c9a21dc4454aba54fbe371d8d38 100644
|
| --- a/mojo/shell/shell_application_delegate.cc
|
| +++ b/mojo/shell/shell_application_delegate.cc
|
| @@ -9,9 +9,10 @@
|
| #include <utility>
|
|
|
| #include "base/process/process.h"
|
| +#include "mojo/edk/embedder/embedder.h"
|
| +#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/shell/application_manager.h"
|
| #include "mojo/shell/public/cpp/application_connection.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
|
|
|
| namespace mojo {
|
| namespace shell {
|
| @@ -74,11 +75,11 @@ void ShellApplicationDelegate::RegisterProcessWithBroker(
|
| }
|
| }
|
|
|
| - embedder::ScopedPlatformHandle platform_pipe;
|
| - MojoResult rv = embedder::PassWrappedPlatformHandle(
|
| + edk::ScopedPlatformHandle platform_pipe;
|
| + MojoResult rv = edk::PassWrappedPlatformHandle(
|
| pipe.release().value(), &platform_pipe);
|
| CHECK_EQ(rv, MOJO_RESULT_OK);
|
| - embedder::ChildProcessLaunched(process.Handle(), std::move(platform_pipe));
|
| + edk::ChildProcessLaunched(process.Handle(), std::move(platform_pipe));
|
| }
|
|
|
| void ShellApplicationDelegate::AddListener(
|
|
|