| Index: ppapi/proxy/file_ref_resource.h
|
| diff --git a/ppapi/proxy/file_ref_resource.h b/ppapi/proxy/file_ref_resource.h
|
| index 82570fbc09cae6367239b2ff124f0d0935d23652..f982438fb0ddca61bfb34d7e2e1b8066faaf5e1b 100644
|
| --- a/ppapi/proxy/file_ref_resource.h
|
| +++ b/ppapi/proxy/file_ref_resource.h
|
| @@ -29,7 +29,7 @@ class PPAPI_PROXY_EXPORT FileRefResource
|
| public:
|
| static PP_Resource CreateFileRef(Connection connection,
|
| PP_Instance instance,
|
| - const FileRef_CreateInfo& info);
|
| + const FileRefCreateInfo& info);
|
|
|
| virtual ~FileRefResource();
|
|
|
| @@ -55,13 +55,7 @@ class PPAPI_PROXY_EXPORT FileRefResource
|
| virtual int32_t ReadDirectoryEntries(
|
| const PP_ArrayOutput& output,
|
| scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| - virtual const PPB_FileRef_CreateInfo& GetCreateInfo() const OVERRIDE;
|
| - virtual int32_t QueryInHost(linked_ptr<PP_FileInfo> info,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| - virtual int32_t ReadDirectoryEntriesInHost(
|
| - linked_ptr<std::vector<ppapi::PPB_FileRef_CreateInfo> > files,
|
| - linked_ptr<std::vector<PP_FileType> > file_types,
|
| - scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + virtual const FileRefCreateInfo& GetCreateInfo() const OVERRIDE;
|
|
|
| // Private API
|
| virtual PP_Var GetAbsolutePath() OVERRIDE;
|
| @@ -69,7 +63,7 @@ class PPAPI_PROXY_EXPORT FileRefResource
|
| private:
|
| FileRefResource(Connection connection,
|
| PP_Instance instance,
|
| - const FileRef_CreateInfo& info);
|
| + const FileRefCreateInfo& info);
|
|
|
| void RunTrackedCallback(scoped_refptr<TrackedCallback> callback,
|
| const ResourceMessageReplyParams& params);
|
| @@ -83,11 +77,11 @@ class PPAPI_PROXY_EXPORT FileRefResource
|
| const PP_ArrayOutput& output,
|
| scoped_refptr<TrackedCallback> callback,
|
| const ResourceMessageReplyParams& params,
|
| - const std::vector<ppapi::FileRef_CreateInfo>& infos,
|
| + const std::vector<ppapi::FileRefCreateInfo>& infos,
|
| const std::vector<PP_FileType>& file_types);
|
|
|
| // Populated after creation.
|
| - FileRef_CreateInfo create_info_;
|
| + FileRefCreateInfo create_info_;
|
|
|
| // Some file ref operations may fail if the the file system resource inside
|
| // create_info_ is destroyed. Therefore, we explicitly hold a reference to
|
|
|