Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc

Issue 322403005: Pepper: Remove nacl_entry_points.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
diff --git a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
index a5789d610e94c156aef9394dc84dc512218ec5d6..46d636729db3a0c24b13e2f2f7f3d2ffcda81e45 100644
--- a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
+++ b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
@@ -5,10 +5,8 @@
#include "native_client/src/include/nacl_macros.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/cpp/module.h"
-#include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
#include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
-
-LaunchNaClProcessFunc launch_nacl_process = NULL;
+#include "ppapi/native_client/src/trusted/plugin/utility.h"
namespace plugin {
@@ -31,24 +29,25 @@ void SelLdrLauncherChrome::Start(
const PPP_ManifestService* manifest_service_interface,
void* manifest_service_user_data,
pp::CompletionCallback callback) {
- if (!launch_nacl_process) {
+ if (!GetNaClInterface()) {
pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
return;
}
- launch_nacl_process(instance,
- PP_FromBool(main_service_runtime),
- url,
- PP_FromBool(uses_irt),
- PP_FromBool(uses_ppapi),
- PP_FromBool(uses_nonsfi_mode),
- PP_FromBool(enable_ppapi_dev),
- PP_FromBool(enable_dyncode_syscalls),
- PP_FromBool(enable_exception_handling),
- PP_FromBool(enable_crash_throttling),
- manifest_service_interface,
- manifest_service_user_data,
- &channel_,
- callback.pp_completion_callback());
+ GetNaClInterface()->LaunchSelLdr(
+ instance,
+ PP_FromBool(main_service_runtime),
+ url,
+ PP_FromBool(uses_irt),
+ PP_FromBool(uses_ppapi),
+ PP_FromBool(uses_nonsfi_mode),
+ PP_FromBool(enable_ppapi_dev),
+ PP_FromBool(enable_dyncode_syscalls),
+ PP_FromBool(enable_exception_handling),
+ PP_FromBool(enable_crash_throttling),
+ manifest_service_interface,
+ manifest_service_user_data,
+ &channel_,
+ callback.pp_completion_callback());
}
} // namespace plugin
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698