| Index: components/nacl/browser/nacl_process_host.h
|
| diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
|
| index 324db114e0201e94ac9686688618cc961a3c83b4..af6d4ee936922eaf11a26a8e2ef2e1e3fe1be2d1 100644
|
| --- a/components/nacl/browser/nacl_process_host.h
|
| +++ b/components/nacl/browser/nacl_process_host.h
|
| @@ -74,8 +74,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
|
| const GURL& manifest_url,
|
| base::File nexe_file,
|
| const NaClFileToken& nexe_token,
|
| - const std::vector<
|
| - nacl::NaClResourceFileInfo>& prefetched_resource_files_info,
|
| + const std::vector<NaClResourcePrefetchInfo>& resource_prefetch_info_list,
|
| ppapi::PpapiPermissions permissions,
|
| int render_view_id,
|
| uint32 permission_bits,
|
| @@ -159,10 +158,10 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
|
| // Sends the message to the NaCl process to load the plugin. Returns true
|
| // on success.
|
| bool StartNaClExecution();
|
| -
|
| - void StartNaClFileResolved(
|
| + void StartNaClExecutionAfterFileResolved(
|
| NaClStartParams params,
|
| - const base::FilePath& file_path,
|
| + scoped_ptr<base::FilePath> nexe_file_path,
|
| + scoped_ptr<std::vector<NaClResourceFileInfo> > prefetched_resource_files,
|
| base::File nexe_file);
|
|
|
| // Does post-process-launching tasks for starting the NaCl process once
|
| @@ -198,7 +197,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
|
| GURL manifest_url_;
|
| base::File nexe_file_;
|
| NaClFileToken nexe_token_;
|
| - std::vector<nacl::NaClResourceFileInfo> prefetched_resource_files_info_;
|
| + std::vector<NaClResourcePrefetchInfo> resource_prefetch_info_list_;
|
|
|
| ppapi::PpapiPermissions permissions_;
|
|
|
|
|