Chromium Code Reviews| Index: ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc |
| =================================================================== |
| --- ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc (revision 210749) |
| +++ ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc (working copy) |
| @@ -7,6 +7,8 @@ |
| #include "native_client/src/trusted/plugin/nacl_entry_points.h" |
| +#include "ppapi/cpp/var.h" |
| + |
| LaunchNaClProcessFunc launch_nacl_process = NULL; |
| namespace plugin { |
| @@ -22,9 +24,12 @@ |
| bool uses_ppapi, |
| bool enable_ppapi_dev, |
| bool enable_dyncode_syscalls, |
| - bool enable_exception_handling) { |
| + bool enable_exception_handling, |
| + nacl::string* error_message) { |
| + *error_message = ""; |
| if (!launch_nacl_process) |
| return false; |
| + struct PP_Var var; |
|
dmichael (off chromium)
2013/07/10 17:07:20
struct is unnecessary here
halyavin
2013/07/11 09:03:36
Done.
|
| // send a synchronous message to the browser process |
| if (launch_nacl_process(instance, |
| url, |
| @@ -33,7 +38,9 @@ |
| PP_FromBool(enable_ppapi_dev), |
| PP_FromBool(enable_dyncode_syscalls), |
| PP_FromBool(enable_exception_handling), |
| - &channel_) != PP_NACL_OK) { |
| + &channel_, |
| + &var) != PP_NACL_OK) { |
| + *error_message = pp::Var(var).AsString(); |
|
dmichael (off chromium)
2013/07/10 17:07:20
You need to use the PassRef constructor, or you'll
halyavin
2013/07/11 09:03:36
Done.
|
| return false; |
| } |
| return true; |