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" |
11 #include "mojo/public/cpp/application/application_connection.h" | |
12 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
13 #include "mojo/public/cpp/application/application_runner.h" | 12 #include "mojo/public/cpp/application/application_runner.h" |
| 13 #include "mojo/public/cpp/application/service_provider_impl.h" |
14 #include "mojo/public/cpp/bindings/strong_binding.h" | 14 #include "mojo/public/cpp/bindings/strong_binding.h" |
15 #include "services/nacl/nonsfi/kLdNexe.h" | 15 #include "services/nacl/nonsfi/kLdNexe.h" |
16 #include "services/nacl/nonsfi/pnacl_link.mojom.h" | 16 #include "services/nacl/nonsfi/pnacl_link.mojom.h" |
17 | 17 |
18 namespace mojo { | 18 namespace mojo { |
19 namespace nacl { | 19 namespace nacl { |
20 | 20 |
21 class PexeLinkerImpl : public PexeLinkerInit { | 21 class PexeLinkerImpl : public PexeLinkerInit { |
22 public: | 22 public: |
23 void PexeLinkerStart(InterfaceRequest<PexeLinker> linker_request) override { | 23 void PexeLinkerStart(InterfaceRequest<PexeLinker> linker_request) override { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 }; | 55 }; |
56 | 56 |
57 } // namespace nacl | 57 } // namespace nacl |
58 } // namespace mojo | 58 } // namespace mojo |
59 | 59 |
60 MojoResult MojoMain(MojoHandle application_request) { | 60 MojoResult MojoMain(MojoHandle application_request) { |
61 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>( | 61 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>( |
62 new mojo::nacl::MultiPexeLinker())); | 62 new mojo::nacl::MultiPexeLinker())); |
63 return runner.Run(application_request); | 63 return runner.Run(application_request); |
64 } | 64 } |
OLD | NEW |