| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "native_client/src/include/nacl_macros.h" | 5 #include "native_client/src/include/nacl_macros.h" |
| 6 #include "ppapi/c/pp_errors.h" | 6 #include "ppapi/c/pp_errors.h" |
| 7 #include "ppapi/cpp/module.h" | 7 #include "ppapi/cpp/module.h" |
| 8 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" | 8 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" |
| 9 #include "ppapi/native_client/src/trusted/plugin/utility.h" | 9 #include "ppapi/native_client/src/trusted/plugin/utility.h" |
| 10 | 10 |
| 11 namespace plugin { | 11 namespace plugin { |
| 12 | 12 |
| 13 bool SelLdrLauncherChrome::Start(const char* url) { | 13 bool SelLdrLauncherChrome::Start(const char* url) { |
| 14 NACL_NOTREACHED(); | 14 NACL_NOTREACHED(); |
| 15 return false; | 15 return false; |
| 16 } | 16 } |
| 17 | 17 |
| 18 void SelLdrLauncherChrome::Start( | 18 void SelLdrLauncherChrome::Start( |
| 19 PP_Instance instance, | 19 PP_Instance instance, |
| 20 bool main_service_runtime, | 20 bool main_service_runtime, |
| 21 const char* url, | 21 const char* url, |
| 22 const PP_NaClFileInfo* file_info, | 22 const PP_NaClFileInfo* file_info, |
| 23 bool uses_irt, | 23 bool uses_irt, |
| 24 bool uses_ppapi, | 24 bool uses_ppapi, |
| 25 bool uses_nonsfi_mode, | 25 bool uses_nonsfi_mode, |
| 26 bool enable_ppapi_dev, | 26 bool enable_ppapi_dev, |
| 27 bool enable_dyncode_syscalls, | 27 bool enable_dyncode_syscalls, |
| 28 bool enable_exception_handling, | 28 bool enable_exception_handling, |
| 29 bool enable_crash_throttling, | 29 bool enable_crash_throttling, |
| 30 const PPP_ManifestService* manifest_service_interface, | |
| 31 void* manifest_service_user_data, | |
| 32 pp::CompletionCallback callback) { | 30 pp::CompletionCallback callback) { |
| 33 if (!GetNaClInterface()) { | 31 if (!GetNaClInterface()) { |
| 34 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); | 32 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); |
| 35 return; | 33 return; |
| 36 } | 34 } |
| 37 GetNaClInterface()->LaunchSelLdr( | 35 GetNaClInterface()->LaunchSelLdr( |
| 38 instance, | 36 instance, |
| 39 PP_FromBool(main_service_runtime), | 37 PP_FromBool(main_service_runtime), |
| 40 url, | 38 url, |
| 41 file_info, | 39 file_info, |
| 42 PP_FromBool(uses_irt), | 40 PP_FromBool(uses_irt), |
| 43 PP_FromBool(uses_ppapi), | 41 PP_FromBool(uses_ppapi), |
| 44 PP_FromBool(uses_nonsfi_mode), | 42 PP_FromBool(uses_nonsfi_mode), |
| 45 PP_FromBool(enable_ppapi_dev), | 43 PP_FromBool(enable_ppapi_dev), |
| 46 PP_FromBool(enable_dyncode_syscalls), | 44 PP_FromBool(enable_dyncode_syscalls), |
| 47 PP_FromBool(enable_exception_handling), | 45 PP_FromBool(enable_exception_handling), |
| 48 PP_FromBool(enable_crash_throttling), | 46 PP_FromBool(enable_crash_throttling), |
| 49 manifest_service_interface, | |
| 50 manifest_service_user_data, | |
| 51 &channel_, | 47 &channel_, |
| 52 callback.pp_completion_callback()); | 48 callback.pp_completion_callback()); |
| 53 } | 49 } |
| 54 | 50 |
| 55 } // namespace plugin | 51 } // namespace plugin |
| OLD | NEW |