Index: components/nacl/common/nacl_types.cc |
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc |
index 0dc5a1cf312be215da7402ade1010a10f76395fa..6e035f9377265c24bf04595d5cf913810a8017b2 100644 |
--- a/components/nacl/common/nacl_types.cc |
+++ b/components/nacl/common/nacl_types.cc |
@@ -28,15 +28,18 @@ NaClLaunchParams::NaClLaunchParams() |
enable_crash_throttling(false) { |
} |
-NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, |
- int render_view_id, |
- uint32 permission_bits, |
- bool uses_irt, |
- bool uses_nonsfi_mode, |
- bool enable_dyncode_syscalls, |
- bool enable_exception_handling, |
- bool enable_crash_throttling) |
+NaClLaunchParams::NaClLaunchParams( |
+ const std::string& manifest_url, |
+ const IPC::PlatformFileForTransit& nexe_file, |
+ int render_view_id, |
+ uint32 permission_bits, |
+ bool uses_irt, |
+ bool uses_nonsfi_mode, |
+ bool enable_dyncode_syscalls, |
+ bool enable_exception_handling, |
+ bool enable_crash_throttling) |
: manifest_url(manifest_url), |
+ nexe_file(nexe_file), |
render_view_id(render_view_id), |
permission_bits(permission_bits), |
uses_irt(uses_irt), |
@@ -46,14 +49,16 @@ NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, |
enable_crash_throttling(enable_crash_throttling) { |
} |
-NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { |
- manifest_url = l.manifest_url; |
- render_view_id = l.render_view_id; |
- permission_bits = l.permission_bits; |
- uses_irt = l.uses_irt; |
- enable_dyncode_syscalls = l.enable_dyncode_syscalls; |
- enable_exception_handling = l.enable_exception_handling; |
- enable_crash_throttling = l.enable_crash_throttling; |
+NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) |
+ : manifest_url(l.manifest_url), |
+ nexe_file(l.nexe_file), |
+ render_view_id(l.render_view_id), |
+ permission_bits(l.permission_bits), |
+ uses_irt(l.uses_irt), |
+ uses_nonsfi_mode(l.uses_nonsfi_mode), |
+ enable_dyncode_syscalls(l.enable_dyncode_syscalls), |
+ enable_exception_handling(l.enable_exception_handling), |
+ enable_crash_throttling(l.enable_crash_throttling) { |
} |
NaClLaunchParams::~NaClLaunchParams() { |