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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
9 #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"
10 9 #include "ppapi/native_client/src/trusted/plugin/utility.h"
11 LaunchNaClProcessFunc launch_nacl_process = NULL;
12 10
13 namespace plugin { 11 namespace plugin {
14 12
15 bool SelLdrLauncherChrome::Start(const char* url) { 13 bool SelLdrLauncherChrome::Start(const char* url) {
16 NACL_NOTREACHED(); 14 NACL_NOTREACHED();
17 return false; 15 return false;
18 } 16 }
19 17
20 void SelLdrLauncherChrome::Start( 18 void SelLdrLauncherChrome::Start(
21 PP_Instance instance, 19 PP_Instance instance,
22 bool main_service_runtime, 20 bool main_service_runtime,
23 const char* url, 21 const char* url,
24 bool uses_irt, 22 bool uses_irt,
25 bool uses_ppapi, 23 bool uses_ppapi,
26 bool uses_nonsfi_mode, 24 bool uses_nonsfi_mode,
27 bool enable_ppapi_dev, 25 bool enable_ppapi_dev,
28 bool enable_dyncode_syscalls, 26 bool enable_dyncode_syscalls,
29 bool enable_exception_handling, 27 bool enable_exception_handling,
30 bool enable_crash_throttling, 28 bool enable_crash_throttling,
31 const PPP_ManifestService* manifest_service_interface, 29 const PPP_ManifestService* manifest_service_interface,
32 void* manifest_service_user_data, 30 void* manifest_service_user_data,
33 pp::CompletionCallback callback) { 31 pp::CompletionCallback callback) {
34 if (!launch_nacl_process) { 32 if (!GetNaClInterface()) {
35 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); 33 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
36 return; 34 return;
37 } 35 }
38 launch_nacl_process(instance, 36 GetNaClInterface()->LaunchSelLdr(
39 PP_FromBool(main_service_runtime), 37 instance,
40 url, 38 PP_FromBool(main_service_runtime),
41 PP_FromBool(uses_irt), 39 url,
42 PP_FromBool(uses_ppapi), 40 PP_FromBool(uses_irt),
43 PP_FromBool(uses_nonsfi_mode), 41 PP_FromBool(uses_ppapi),
44 PP_FromBool(enable_ppapi_dev), 42 PP_FromBool(uses_nonsfi_mode),
45 PP_FromBool(enable_dyncode_syscalls), 43 PP_FromBool(enable_ppapi_dev),
46 PP_FromBool(enable_exception_handling), 44 PP_FromBool(enable_dyncode_syscalls),
47 PP_FromBool(enable_crash_throttling), 45 PP_FromBool(enable_exception_handling),
48 manifest_service_interface, 46 PP_FromBool(enable_crash_throttling),
49 manifest_service_user_data, 47 manifest_service_interface,
50 &channel_, 48 manifest_service_user_data,
51 callback.pp_completion_callback()); 49 &channel_,
50 callback.pp_completion_callback());
52 } 51 }
53 52
54 } // namespace plugin 53 } // namespace plugin
OLDNEW
« 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