| 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..eafc0b4f8ed0687e16241503748b8fa7bc4eadd0 100644
|
| --- a/components/nacl/common/nacl_types.cc
|
| +++ b/components/nacl/common/nacl_types.cc
|
| @@ -28,7 +28,8 @@ NaClLaunchParams::NaClLaunchParams()
|
| enable_crash_throttling(false) {
|
| }
|
|
|
| -NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
|
| +NaClLaunchParams::NaClLaunchParams(const std::string& document_url,
|
| + const std::string& manifest_url,
|
| int render_view_id,
|
| uint32 permission_bits,
|
| bool uses_irt,
|
| @@ -36,7 +37,8 @@ NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
|
| bool enable_dyncode_syscalls,
|
| bool enable_exception_handling,
|
| bool enable_crash_throttling)
|
| - : manifest_url(manifest_url),
|
| + : document_url(document_url),
|
| + manifest_url(manifest_url),
|
| render_view_id(render_view_id),
|
| permission_bits(permission_bits),
|
| uses_irt(uses_irt),
|
| @@ -47,6 +49,7 @@ NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url,
|
| }
|
|
|
| NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) {
|
| + document_url = l.document_url;
|
| manifest_url = l.manifest_url;
|
| render_view_id = l.render_view_id;
|
| permission_bits = l.permission_bits;
|
|
|