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> |
| 6 |
5 #include "base/logging.h" | 7 #include "base/logging.h" |
6 #include "mojo/nacl/nonsfi/file_util.h" | 8 #include "mojo/nacl/nonsfi/file_util.h" |
7 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" | 9 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" |
8 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
9 #include "mojo/public/cpp/application/application_connection.h" | 11 #include "mojo/public/cpp/application/application_connection.h" |
10 #include "mojo/public/cpp/application/application_delegate.h" | 12 #include "mojo/public/cpp/application/application_delegate.h" |
11 #include "mojo/public/cpp/application/application_runner.h" | 13 #include "mojo/public/cpp/application/application_runner.h" |
12 #include "mojo/public/cpp/application/interface_factory.h" | 14 #include "mojo/public/cpp/application/interface_factory.h" |
13 #include "mojo/public/cpp/bindings/strong_binding.h" | 15 #include "mojo/public/cpp/bindings/strong_binding.h" |
14 #include "services/nacl/nonsfi/kLdNexe.h" | 16 #include "services/nacl/nonsfi/kLdNexe.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 void Create(ApplicationConnection* connection, | 54 void Create(ApplicationConnection* connection, |
53 InterfaceRequest<PexeLinkerInit> request) override { | 55 InterfaceRequest<PexeLinkerInit> request) override { |
54 new StrongBindingPexeLinkerImpl(request.Pass()); | 56 new StrongBindingPexeLinkerImpl(request.Pass()); |
55 } | 57 } |
56 }; | 58 }; |
57 | 59 |
58 } // namespace nacl | 60 } // namespace nacl |
59 } // namespace mojo | 61 } // namespace mojo |
60 | 62 |
61 MojoResult MojoMain(MojoHandle application_request) { | 63 MojoResult MojoMain(MojoHandle application_request) { |
62 mojo::ApplicationRunner runner(new mojo::nacl::MultiPexeLinker()); | 64 mojo::ApplicationRunner runner(std::unique_ptr<mojo::nacl::MultiPexeLinker>( |
| 65 new mojo::nacl::MultiPexeLinker())); |
63 return runner.Run(application_request); | 66 return runner.Run(application_request); |
64 } | 67 } |
OLD | NEW |