| 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 "base/logging.h" | 5 #include "base/logging.h" | 
| 6 #include "mojo/nacl/nonsfi/file_util.h" | 6 #include "mojo/nacl/nonsfi/file_util.h" | 
| 7 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" | 7 #include "mojo/nacl/nonsfi/nexe_launcher_nonsfi.h" | 
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" | 
| 9 #include "mojo/public/cpp/application/application_impl_base.h" | 9 #include "mojo/public/cpp/application/application_impl_base.h" | 
| 10 #include "mojo/public/cpp/application/run_application.h" | 10 #include "mojo/public/cpp/application/run_application.h" | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 49         }); | 49         }); | 
| 50     return true; | 50     return true; | 
| 51   } | 51   } | 
| 52 }; | 52 }; | 
| 53 | 53 | 
| 54 }  // namespace nacl | 54 }  // namespace nacl | 
| 55 }  // namespace mojo | 55 }  // namespace mojo | 
| 56 | 56 | 
| 57 MojoResult MojoMain(MojoHandle application_request) { | 57 MojoResult MojoMain(MojoHandle application_request) { | 
| 58   mojo::nacl::MultiPexeLinker multi_pexe_linker; | 58   mojo::nacl::MultiPexeLinker multi_pexe_linker; | 
| 59   return mojo::RunMainApplication(application_request, &multi_pexe_linker); | 59   return mojo::RunApplication(application_request, &multi_pexe_linker); | 
| 60 } | 60 } | 
| OLD | NEW | 
|---|