| Index: components/nacl/common/nacl_types.cc
|
| diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
|
| index 4abb8286ea8a0cef1e87ed4884c37b91ab862a98..d9e994fc1a1f689c9abaf7fa177a67c9981e35b2 100644
|
| --- a/components/nacl/common/nacl_types.cc
|
| +++ b/components/nacl/common/nacl_types.cc
|
| @@ -34,6 +34,19 @@ NaClResourceFileInfo::NaClResourceFileInfo(
|
| NaClResourceFileInfo::~NaClResourceFileInfo() {
|
| }
|
|
|
| +NaClResourcePrefetchInfo::NaClResourcePrefetchInfo() {
|
| +}
|
| +
|
| +NaClResourcePrefetchInfo::NaClResourcePrefetchInfo(
|
| + const std::string& manifest_key,
|
| + const std::string& resource_url)
|
| + : manifest_key(manifest_key),
|
| + resource_url(resource_url) {
|
| +}
|
| +
|
| +NaClResourcePrefetchInfo::~NaClResourcePrefetchInfo() {
|
| +}
|
| +
|
| NaClLaunchParams::NaClLaunchParams()
|
| : nexe_file(IPC::InvalidPlatformFileForTransit()),
|
| nexe_token_lo(0),
|
| @@ -48,8 +61,7 @@ NaClLaunchParams::NaClLaunchParams(
|
| const IPC::PlatformFileForTransit& nexe_file,
|
| uint64_t nexe_token_lo,
|
| uint64_t nexe_token_hi,
|
| - const std::vector<
|
| - std::pair<std::string, std::string> >& resource_files_to_prefetch,
|
| + const std::vector<NaClResourcePrefetchInfo>& resource_prefetch_info_list,
|
| int render_view_id,
|
| uint32 permission_bits,
|
| bool uses_nonsfi_mode,
|
| @@ -58,7 +70,7 @@ NaClLaunchParams::NaClLaunchParams(
|
| nexe_file(nexe_file),
|
| nexe_token_lo(nexe_token_lo),
|
| nexe_token_hi(nexe_token_hi),
|
| - resource_files_to_prefetch(resource_files_to_prefetch),
|
| + resource_prefetch_info_list(resource_prefetch_info_list),
|
| render_view_id(render_view_id),
|
| permission_bits(permission_bits),
|
| uses_nonsfi_mode(uses_nonsfi_mode),
|
|
|