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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc

Issue 282683002: Pepper: Simplify LaunchSelLdr error reporting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/nacl_entry_points.h" 8 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
9 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" 9 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
10 10
11 LaunchNaClProcessFunc launch_nacl_process = NULL; 11 LaunchNaClProcessFunc launch_nacl_process = NULL;
12 12
13 namespace plugin { 13 namespace plugin {
14 14
15 bool SelLdrLauncherChrome::Start(const char* url) { 15 bool SelLdrLauncherChrome::Start(const char* url) {
16 NACL_NOTREACHED(); 16 NACL_NOTREACHED();
17 return false; 17 return false;
18 } 18 }
19 19
20 void SelLdrLauncherChrome::Start( 20 void SelLdrLauncherChrome::Start(
21 PP_Instance instance, 21 PP_Instance instance,
22 bool main_service_runtime,
22 const char* url, 23 const char* url,
23 bool uses_irt, 24 bool uses_irt,
24 bool uses_ppapi, 25 bool uses_ppapi,
25 bool uses_nonsfi_mode, 26 bool uses_nonsfi_mode,
26 bool enable_ppapi_dev, 27 bool enable_ppapi_dev,
27 bool enable_dyncode_syscalls, 28 bool enable_dyncode_syscalls,
28 bool enable_exception_handling, 29 bool enable_exception_handling,
29 bool enable_crash_throttling, 30 bool enable_crash_throttling,
30 const PPP_ManifestService* manifest_service_interface, 31 const PPP_ManifestService* manifest_service_interface,
31 void* manifest_service_user_data, 32 void* manifest_service_user_data,
32 PP_Var* error_message,
33 pp::CompletionCallback callback) { 33 pp::CompletionCallback callback) {
34 if (!launch_nacl_process) { 34 if (!launch_nacl_process) {
35 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); 35 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
36 return; 36 return;
37 } 37 }
38 launch_nacl_process(instance, 38 launch_nacl_process(instance,
39 PP_FromBool(main_service_runtime),
39 url, 40 url,
40 PP_FromBool(uses_irt), 41 PP_FromBool(uses_irt),
41 PP_FromBool(uses_ppapi), 42 PP_FromBool(uses_ppapi),
42 PP_FromBool(uses_nonsfi_mode), 43 PP_FromBool(uses_nonsfi_mode),
43 PP_FromBool(enable_ppapi_dev), 44 PP_FromBool(enable_ppapi_dev),
44 PP_FromBool(enable_dyncode_syscalls), 45 PP_FromBool(enable_dyncode_syscalls),
45 PP_FromBool(enable_exception_handling), 46 PP_FromBool(enable_exception_handling),
46 PP_FromBool(enable_crash_throttling), 47 PP_FromBool(enable_crash_throttling),
47 manifest_service_interface, 48 manifest_service_interface,
48 manifest_service_user_data, 49 manifest_service_user_data,
49 &channel_, 50 &channel_,
50 error_message,
51 callback.pp_completion_callback()); 51 callback.pp_completion_callback());
52 } 52 }
53 53
54 } // namespace plugin 54 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698