| Index: content/renderer/pepper/pepper_file_chooser_host.cc
|
| diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc
|
| index 63cd7a6e65d4b7343995381487fe4b951cea7722..4ed77a2651c1ec5a58ac18d33d4be4a64b1aae60 100644
|
| --- a/content/renderer/pepper/pepper_file_chooser_host.cc
|
| +++ b/content/renderer/pepper/pepper_file_chooser_host.cc
|
| @@ -166,19 +166,22 @@ int32_t PepperFileChooserHost::OnShow(
|
| void PepperFileChooserHost::DidCreateResourceHosts(
|
| const std::vector<base::FilePath>& file_paths,
|
| const std::vector<std::string>& display_names,
|
| - const std::vector<int>& browser_ids) {
|
| - DCHECK(file_paths.size() == display_names.size());
|
| - DCHECK(file_paths.size() == browser_ids.size());
|
| + const ppapi::proxy::CompletedBrowserResourceHosts& browser_hosts) {
|
| + DCHECK_EQ(file_paths.size(), display_names.size());
|
| + DCHECK_EQ(file_paths.size(), browser_hosts.host_ids.size());
|
|
|
| std::vector<ppapi::FileRefCreateInfo> chosen_files;
|
| - for (size_t i = 0; i < browser_ids.size(); ++i) {
|
| + for (size_t i = 0; i < browser_hosts.host_ids.size(); ++i) {
|
| PepperFileRefRendererHost* renderer_host = new PepperFileRefRendererHost(
|
| renderer_ppapi_host_, pp_instance(), 0, file_paths[i]);
|
| int renderer_id =
|
| renderer_ppapi_host_->GetPpapiHost()->AddPendingResourceHost(
|
| scoped_ptr<ppapi::host::ResourceHost>(renderer_host));
|
| ppapi::FileRefCreateInfo info = ppapi::MakeExternalFileRefCreateInfo(
|
| - file_paths[i], display_names[i], browser_ids[i], renderer_id);
|
| + file_paths[i],
|
| + display_names[i],
|
| + browser_hosts.host_ids[i],
|
| + renderer_id);
|
| chosen_files.push_back(info);
|
| }
|
|
|
|
|