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 e7e0135aecb8e69bd971abc727b4d78aa5f3d7e1..49470ed71d31f76ba9f9ba3023c93099be4ac340 100644 |
--- a/components/nacl/browser/nacl_process_host.h |
+++ b/components/nacl/browser/nacl_process_host.h |
@@ -74,7 +74,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate { |
const GURL& manifest_url, |
base::File nexe_file, |
const NaClFileToken& nexe_token, |
- const std::vector<NaClResourcePrefetchResult>& prefetched_resource_files, |
+ const std::vector<NaClResourcePrefetchRequest>& |
+ resource_prefetch_request_list, |
ppapi::PpapiPermissions permissions, |
int render_view_id, |
uint32 permission_bits, |
@@ -158,10 +159,11 @@ 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<NaClResourcePrefetchResult> > |
+ prefetched_resource_files, |
base::File nexe_file); |
// Does post-process-launching tasks for starting the NaCl process once |
@@ -197,7 +199,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate { |
GURL manifest_url_; |
base::File nexe_file_; |
NaClFileToken nexe_token_; |
- std::vector<NaClResourcePrefetchResult> prefetched_resource_files_; |
+ std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list_; |
ppapi::PpapiPermissions permissions_; |