Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / file_system_interface.h

diff --git a/src/chrome/browser/chromeos/drive/file_system_interface.h b/src/chrome/browser/chromeos/drive/file_system_interface.h
index d80e292..1ddbc8f 100644 (file)
--- a/src/chrome/browser/chromeos/drive/file_system_interface.h
+++ b/src/chrome/browser/chromeos/drive/file_system_interface.h
@@ -79,11 +79,8 @@ typedef base::Callback<void(FileError error,
     GetFileContentInitializedCallback;
 
 // Used to get list of entries under a directory.
-// If |error| is not FILE_ERROR_OK, |entries| is null.
-typedef base::Callback<void(FileError error,
-                            scoped_ptr<ResourceEntryVector> entries,
-                            bool has_more)>
-    ReadDirectoryCallback;
+typedef base::Callback<void(scoped_ptr<ResourceEntryVector> entries)>
+    ReadDirectoryEntriesCallback;
 
 // Used to get drive content search results.
 // If |error| is not FILE_ERROR_OK, |result_paths| is empty.
@@ -359,10 +356,13 @@ class FileSystemInterface {
 
   // Finds and reads a directory by |file_path|. This call will also retrieve
   // and refresh file system content from server and disk cache.
+  // |entries_callback| can be a null callback when not interested in entries.
   //
-  // |callback| must not be null.
-  virtual void ReadDirectory(const base::FilePath& file_path,
-                             const ReadDirectoryCallback& callback) = 0;
+  // |completion_callback| must not be null.
+  virtual void ReadDirectory(
+      const base::FilePath& file_path,
+      const ReadDirectoryEntriesCallback& entries_callback,
+      const FileOperationCallback& completion_callback) = 0;
 
   // Does server side content search for |search_query|.
   // If |next_link| is set, this is the search result url that will be