Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

webkit/plugins/ppapi/file_callbacks.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_
 #define WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_
 
 #include <string>
 #include <vector>
 
+#include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
+#include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 
 struct PP_FileInfo;
 
 namespace base {
 class FilePath;
 }
 
 namespace ppapi {
 class Resource;
 class TrackedCallback;
+struct PPB_FileRef_CreateInfo;
 }
 
 namespace webkit {
 namespace ppapi {
 
+class PPB_FileRef_Impl;
+
 // Instances of this class are deleted by FileSystemDispatcher.
 class FileCallbacks : public fileapi::FileSystemCallbackDispatcher {
  public:
+  // Don't take the ownership of members.

[teravest, 2013/05/02 17:32:10]

s/Don't/Doesn't/ ?

[hamaji, 2013/05/02 18:49:40]

Done.

+  struct ReadEntriesParams {
+    PPB_FileRef_Impl* dir_ref;
+    std::vector< ::ppapi::PPB_FileRef_CreateInfo>* files;
+    std::vector<PP_FileType>* file_types;
+  };
+
   FileCallbacks(::ppapi::Resource* resource,
                 scoped_refptr< ::ppapi::TrackedCallback> callback,
                 PP_FileInfo* info);
   FileCallbacks(::ppapi::Resource* resource,
                 scoped_refptr< ::ppapi::TrackedCallback> callback,
                 PP_FileInfo* info,
                 PP_FileSystemType file_system_type);
+  FileCallbacks(::ppapi::Resource* resource,
+                scoped_refptr< ::ppapi::TrackedCallback> callback,
+                base::internal::OwnedWrapper<ReadEntriesParams> params);

[dmichael (off chromium), 2013/05/02 19:43:54]

Can you just use scoped_ptr and scoped_ptr::Pass? Or, maybe simpler...  It's
just a bundle of 3 pointers. You could just pass it by const-ref & own it by
value.

[hamaji, 2013/05/02 20:14:49]

Yeah, I've modified this code to just pass |params| by value after teravest's
comment.

   virtual ~FileCallbacks();
 
   // FileSystemCallbackDispatcher implementation.
   virtual void DidSucceed();
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& unused);
   virtual void DidCreateSnapshotFile(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& path);
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more);
   virtual void DidOpenFileSystem(const std::string&,
                                  const GURL& root_url);
   virtual void DidFail(base::PlatformFileError error_code);
   virtual void DidWrite(int64 bytes, bool complete);
 
   scoped_refptr< ::ppapi::TrackedCallback> GetTrackedCallback() const;
 
  private:
   void RunCallback(base::PlatformFileError error_code);
 
   scoped_refptr< ::ppapi::TrackedCallback> callback_;
   PP_FileInfo* info_;
   PP_FileSystemType file_system_type_;
+  base::internal::OwnedWrapper<ReadEntriesParams> read_entries_params_;
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_