| Index: chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
|
| diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
|
| index 6894279a28ef861f970bd5f97dc726693168240c..63a285a17884d2dad2e39509d3ceeb390369476c 100644
|
| --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
|
| +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
|
| @@ -25,22 +25,22 @@
|
| #include "base/callback_forward.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/chromeos/drive/file_errors.h"
|
| -#include "webkit/common/blob/scoped_file.h"
|
| +#include "storage/common/blob/scoped_file.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| } // namespace base
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| struct DirectoryEntry;
|
| class FileSystemURL;
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| namespace drive {
|
|
|
| class FileSystemInterface;
|
|
|
| -namespace fileapi_internal {
|
| +namespace storage_internal {
|
|
|
| typedef base::Callback<FileSystemInterface*()> FileSystemGetter;
|
|
|
| @@ -51,14 +51,13 @@ typedef base::Callback<
|
| const base::File::Info& file_info)> GetFileInfoCallback;
|
| typedef base::Callback<
|
| void(base::File::Error result,
|
| - const std::vector<fileapi::DirectoryEntry>& file_list,
|
| + const std::vector<storage::DirectoryEntry>& file_list,
|
| bool has_more)> ReadDirectoryCallback;
|
| -typedef base::Callback<
|
| - void(base::File::Error result,
|
| - const base::File::Info& file_info,
|
| - const base::FilePath& snapshot_file_path,
|
| - webkit_blob::ScopedFile::ScopeOutPolicy scope_out_policy)>
|
| - CreateSnapshotFileCallback;
|
| +typedef base::Callback<void(base::File::Error result,
|
| + const base::File::Info& file_info,
|
| + const base::FilePath& snapshot_file_path,
|
| + storage::ScopedFile::ScopeOutPolicy
|
| + scope_out_policy)> CreateSnapshotFileCallback;
|
| typedef base::Callback<
|
| void(base::File::Error result,
|
| const base::FilePath& snapshot_file_path,
|
| @@ -71,7 +70,7 @@ typedef base::Callback<
|
| // Gets the profile of the Drive entry pointed by |url|. Used as
|
| // FileSystemGetter callback by binding an URL on the IO thread and passing to
|
| // the UI thread.
|
| -FileSystemInterface* GetFileSystemFromUrl(const fileapi::FileSystemURL& url);
|
| +FileSystemInterface* GetFileSystemFromUrl(const storage::FileSystemURL& url);
|
|
|
| // Runs |file_system_getter| to obtain the instance of FileSystemInstance,
|
| // and then runs |callback| with it.
|
| @@ -176,7 +175,7 @@ void TouchFile(const base::FilePath& file_path,
|
| const StatusCallback& callback,
|
| FileSystemInterface* file_system);
|
|
|
| -} // namespace fileapi_internal
|
| +} // namespace storage_internal
|
| } // namespace drive
|
|
|
| #endif // CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_
|
|
|