| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "mojo/nacl/nonsfi/file_util.h" | 8 #include "mojo/nacl/nonsfi/file_util.h" |
| 9 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" | 9 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" |
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 public: | 47 public: |
| 48 MultiPexeCompiler() {} | 48 MultiPexeCompiler() {} |
| 49 | 49 |
| 50 // From ApplicationDelegate | 50 // From ApplicationDelegate |
| 51 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { | 51 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
| 52 connection->AddService<PexeCompilerInit>(this); | 52 connection->AddService<PexeCompilerInit>(this); |
| 53 return true; | 53 return true; |
| 54 } | 54 } |
| 55 | 55 |
| 56 // From InterfaceFactory | 56 // From InterfaceFactory |
| 57 void Create(ApplicationConnection* connection, | 57 void Create(const ConnectionContext& connection_context, |
| 58 InterfaceRequest<PexeCompilerInit> request) override { | 58 InterfaceRequest<PexeCompilerInit> request) override { |
| 59 new StrongBindingPexeCompilerImpl(request.Pass()); | 59 new StrongBindingPexeCompilerImpl(request.Pass()); |
| 60 } | 60 } |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 } // namespace nacl | 63 } // namespace nacl |
| 64 } // namespace mojo | 64 } // namespace mojo |
| 65 | 65 |
| 66 MojoResult MojoMain(MojoHandle application_request) { | 66 MojoResult MojoMain(MojoHandle application_request) { |
| 67 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeCompiler>( | 67 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeCompiler>( |
| 68 new mojo::nacl::MultiPexeCompiler())); | 68 new mojo::nacl::MultiPexeCompiler())); |
| 69 return runner.Run(application_request); | 69 return runner.Run(application_request); |
| 70 } | 70 } |
| OLD | NEW |