diff options
Diffstat (limited to 'mojo/runner/child_process.cc')
| -rw-r--r-- | mojo/runner/child_process.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mojo/runner/child_process.cc b/mojo/runner/child_process.cc index dc9b59f..4fb6047 100644 --- a/mojo/runner/child_process.cc +++ b/mojo/runner/child_process.cc @@ -20,17 +20,16 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" -#include "mojo/edk/embedder/embedder.h" -#include "mojo/edk/embedder/platform_channel_pair.h" -#include "mojo/edk/embedder/process_delegate.h" -#include "mojo/edk/embedder/scoped_platform_handle.h" -#include "mojo/edk/embedder/simple_platform_support.h" #include "mojo/message_pump/message_pump_mojo.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/system/core.h" #include "mojo/runner/child_process.mojom.h" #include "mojo/runner/native_application_support.h" #include "mojo/runner/switches.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" +#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h" +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #if defined(OS_LINUX) && !defined(OS_ANDROID) #include "base/rand_util.h" @@ -92,6 +91,8 @@ class Blocker { class ChildControllerImpl; // Should be created and initialized on the main thread. +// TODO(use_chrome_edk) +//class AppContext : public edk::ProcessDelegate { class AppContext : public embedder::ProcessDelegate { public: AppContext() @@ -100,7 +101,7 @@ class AppContext : public embedder::ProcessDelegate { void Init() { // Initialize Mojo before starting any threads. - embedder::Init(make_scoped_ptr(new embedder::SimplePlatformSupport())); + embedder::Init(); // Create and start our I/O thread. base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0); |