diff options
| author | amistry <amistry@chromium.org> | 2016-03-21 11:32:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 18:33:59 +0000 |
| commit | 6bebadddb399ad1c1f91592efed410040617e708 (patch) | |
| tree | 1426cccc724ed9d24a312e17b8b3352d04aaa086 /mojo/shell/standalone | |
| parent | 4950587322e8c7d7fff97a65ed9be1bb5030a9cc (diff) | |
| download | chromium_src-6bebadddb399ad1c1f91592efed410040617e708.zip chromium_src-6bebadddb399ad1c1f91592efed410040617e708.tar.gz chromium_src-6bebadddb399ad1c1f91592efed410040617e708.tar.bz2 | |
Add mach ports support to the Mojo shell.
BUG=582468
Review URL: https://codereview.chromium.org/1812523003
Cr-Commit-Position: refs/heads/master@{#382335}
Diffstat (limited to 'mojo/shell/standalone')
| -rw-r--r-- | mojo/shell/standalone/context.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index 5b53879..e64ed82 100644 --- a/mojo/shell/standalone/context.cc +++ b/mojo/shell/standalone/context.cc @@ -43,6 +43,10 @@ #include "mojo/shell/switches.h" #include "mojo/util/filename_util.h" +#if defined(OS_MACOSX) +#include "mojo/shell/runner/host/mach_broker.h" +#endif + namespace mojo { namespace shell { namespace { @@ -136,8 +140,12 @@ void Context::Init(scoped_ptr<InitParams> init_params) { blocking_pool_ = new base::SequencedWorkerPool(kMaxBlockingPoolThreads, "blocking_pool"); - if (!init_params || init_params->init_edk) + if (!init_params || init_params->init_edk) { edk::InitIPCSupport(this, io_thread_->task_runner().get()); +#if defined(OS_MACOSX) + edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider()); +#endif + } scoped_ptr<NativeRunnerFactory> runner_factory; if (command_line.HasSwitch(switches::kSingleProcess)) { |