| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 public: | 44 public: |
| 45 MultiPexeLinker() {} | 45 MultiPexeLinker() {} |
| 46 | 46 |
| 47 // From ApplicationDelegate | 47 // From ApplicationDelegate |
| 48 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { | 48 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
| 49 connection->AddService<PexeLinkerInit>(this); | 49 connection->AddService<PexeLinkerInit>(this); |
| 50 return true; | 50 return true; |
| 51 } | 51 } |
| 52 | 52 |
| 53 // From InterfaceFactory | 53 // From InterfaceFactory |
| 54 void Create(ApplicationConnection* connection, | 54 void Create(const ConnectionContext& connection_context, |
| 55 InterfaceRequest<PexeLinkerInit> request) override { | 55 InterfaceRequest<PexeLinkerInit> request) override { |
| 56 new StrongBindingPexeLinkerImpl(request.Pass()); | 56 new StrongBindingPexeLinkerImpl(request.Pass()); |
| 57 } | 57 } |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 } // namespace nacl | 60 } // namespace nacl |
| 61 } // namespace mojo | 61 } // namespace mojo |
| 62 | 62 |
| 63 MojoResult MojoMain(MojoHandle application_request) { | 63 MojoResult MojoMain(MojoHandle application_request) { |
| 64 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>( | 64 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>( |
| 65 new mojo::nacl::MultiPexeLinker())); | 65 new mojo::nacl::MultiPexeLinker())); |
| 66 return runner.Run(application_request); | 66 return runner.Run(application_request); |
| 67 } | 67 } |
| OLD | NEW |