| 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 f4c63a2fbbcf3ecbbb8e878f20f8996d65f2afd8..fd76135693e91f842392d5e819e2a55287cc3ecc 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
|
| @@ -3,10 +3,8 @@
|
| // found in the LICENSE file.
|
|
|
| #include "native_client/src/include/nacl_macros.h"
|
| -#include "ppapi/c/pp_errors.h"
|
| -#include "ppapi/cpp/module.h"
|
| +#include "native_client/src/shared/platform/nacl_check.h"
|
| #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
|
| -#include "ppapi/native_client/src/trusted/plugin/utility.h"
|
|
|
| namespace plugin {
|
|
|
| @@ -15,37 +13,9 @@ bool SelLdrLauncherChrome::Start(const char* url) {
|
| return false;
|
| }
|
|
|
| -void SelLdrLauncherChrome::Start(
|
| - PP_Instance instance,
|
| - bool main_service_runtime,
|
| - const char* url,
|
| - const PP_NaClFileInfo* file_info,
|
| - bool uses_irt,
|
| - bool uses_ppapi,
|
| - bool uses_nonsfi_mode,
|
| - bool enable_ppapi_dev,
|
| - bool enable_dyncode_syscalls,
|
| - bool enable_exception_handling,
|
| - bool enable_crash_throttling,
|
| - pp::CompletionCallback callback) {
|
| - if (!GetNaClInterface()) {
|
| - pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
|
| - return;
|
| - }
|
| - GetNaClInterface()->LaunchSelLdr(
|
| - instance,
|
| - PP_FromBool(main_service_runtime),
|
| - url,
|
| - file_info,
|
| - 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),
|
| - &channel_,
|
| - callback.pp_completion_callback());
|
| +void SelLdrLauncherChrome::set_channel(NaClHandle channel) {
|
| + CHECK(channel_ == NACL_INVALID_HANDLE);
|
| + channel_ = channel;
|
| }
|
|
|
| } // namespace plugin
|
|
|