| Index: mash/example/window_type_launcher/main.cc
|
| diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc
|
| index 289b56c9df5dae12845fb7cdd59ec5b6ca0a4c66..f41e6bc484ff18f8d6c8ace1ceaf237c6d572487 100644
|
| --- a/mash/example/window_type_launcher/main.cc
|
| +++ b/mash/example/window_type_launcher/main.cc
|
| @@ -14,17 +14,17 @@
|
| #include "base/threading/thread.h"
|
| #include "build/build_config.h"
|
| #include "mash/example/window_type_launcher/window_type_launcher.h"
|
| +#include "mojo/edk/embedder/embedder.h"
|
| +#include "mojo/edk/embedder/process_delegate.h"
|
| #include "mojo/message_pump/message_pump_mojo.h"
|
| #include "mojo/shell/public/cpp/shell_connection.h"
|
| #include "mojo/shell/public/interfaces/shell_client.mojom.h"
|
| #include "mojo/shell/runner/child/runner_connection.h"
|
| #include "mojo/shell/runner/init.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
|
|
|
| namespace {
|
|
|
| -class ProcessDelegate : public mojo::embedder::ProcessDelegate {
|
| +class ProcessDelegate : public mojo::edk::ProcessDelegate {
|
| public:
|
| ProcessDelegate() {}
|
| ~ProcessDelegate() override {}
|
| @@ -52,18 +52,14 @@ int main(int argc, char** argv) {
|
| #endif
|
|
|
| {
|
| - mojo::embedder::PreInitializeChildProcess();
|
| - mojo::embedder::Init();
|
| + mojo::edk::Init();
|
|
|
| ProcessDelegate process_delegate;
|
| base::Thread io_thread("io_thread");
|
| base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
|
| CHECK(io_thread.StartWithOptions(io_thread_options));
|
|
|
| - mojo::embedder::InitIPCSupport(mojo::embedder::ProcessType::NONE,
|
| - &process_delegate,
|
| - io_thread.task_runner().get(),
|
| - mojo::embedder::ScopedPlatformHandle());
|
| + mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner().get());
|
|
|
| mojo::ShellClientRequest request;
|
| scoped_ptr<mojo::shell::RunnerConnection> connection(
|
| @@ -74,7 +70,7 @@ int main(int argc, char** argv) {
|
| mojo::ShellConnection impl(&delegate, std::move(request));
|
| loop.Run();
|
|
|
| - mojo::embedder::ShutdownIPCSupport();
|
| + mojo::edk::ShutdownIPCSupport();
|
| }
|
|
|
| return 0;
|
|
|