Index: webkit/fileapi/file_system_file_util_proxy.h |
diff --git a/webkit/fileapi/file_system_file_util_proxy.h b/webkit/fileapi/file_system_file_util_proxy.h |
index e3763145e29f579c13c8ea1cee94bb851688784b..61c10801771ef51a0466f6b1d46ab2a52a180bed 100644 |
--- a/webkit/fileapi/file_system_file_util_proxy.h |
+++ b/webkit/fileapi/file_system_file_util_proxy.h |
@@ -7,7 +7,7 @@ |
#include <vector> |
-#include "base/callback.h" |
+#include "base/callback_old.h" |
#include "base/file_path.h" |
#include "base/file_util_proxy.h" |
#include "base/memory/ref_counted.h" |
@@ -32,10 +32,15 @@ using base::PlatformFileInfo; |
// FileSystem API. |
class FileSystemFileUtilProxy { |
public: |
- typedef base::FileUtilProxy::StatusCallback StatusCallback; |
- typedef base::FileUtilProxy::CreateOrOpenCallback CreateOrOpenCallback; |
- typedef base::FileUtilProxy::EnsureFileExistsCallback |
- EnsureFileExistsCallback; |
+ typedef base::FileUtilProxy::Entry Entry; |
+ |
+ // TODO(kinuko): replace them with new callback code. |
+ typedef Callback1<PlatformFileError>::Type StatusCallback; |
+ typedef Callback3<PlatformFileError /* error code */, |
+ base::PassPlatformFile, |
+ bool /* created */>::Type CreateOrOpenCallback; |
+ typedef Callback2<PlatformFileError /* error code */, |
+ bool /* created */>::Type EnsureFileExistsCallback; |
typedef Callback3<PlatformFileError /* error code */, |
const PlatformFileInfo& /* file_info */, |
const FilePath& /* platform_path, where possible */ |
@@ -43,7 +48,8 @@ class FileSystemFileUtilProxy { |
typedef Callback2<PlatformFileError /* error code */, |
const FilePath& /* local_path, where possible */ |
>::Type GetLocalPathCallback; |
- typedef base::FileUtilProxy::ReadDirectoryCallback ReadDirectoryCallback; |
+ typedef Callback2<PlatformFileError /* error code */, |
+ const std::vector<Entry>&>::Type ReadDirectoryCallback; |
// Creates or opens a file with the given flags. It is invalid to pass NULL |
// for the callback. |