| Index: chrome/browser/sync_file_system/local/local_file_sync_context.h
|
| diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.h b/chrome/browser/sync_file_system/local/local_file_sync_context.h
|
| index 418fab8666f436e70aaa0ac63d14072b4f839887..e8af9d34e45cf3e6611e93c4daa01dd3c33c7ef4 100644
|
| --- a/chrome/browser/sync_file_system/local/local_file_sync_context.h
|
| +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.h
|
| @@ -12,6 +12,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| +#include "base/files/file.h"
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -208,7 +209,7 @@ class LocalFileSyncContext
|
| virtual void OnWriteEnabled(const fileapi::FileSystemURL& url) OVERRIDE;
|
|
|
| private:
|
| - typedef base::Callback<void(base::PlatformFileError result)> StatusCallback;
|
| + typedef base::Callback<void(base::File::Error result)> StatusCallback;
|
| typedef std::deque<SyncStatusCallback> StatusCallbackQueue;
|
| friend class base::RefCountedThreadSafe<LocalFileSyncContext>;
|
| friend class CannedSyncableFileSystem;
|
| @@ -234,7 +235,7 @@ class LocalFileSyncContext
|
| fileapi::FileSystemContext* file_system_context,
|
| const GURL& /* root */,
|
| const std::string& /* name */,
|
| - base::PlatformFileError error);
|
| + base::File::Error error);
|
| SyncStatusCode InitializeChangeTrackerOnFileThread(
|
| scoped_ptr<LocalFileChangeTracker>* tracker_ptr,
|
| fileapi::FileSystemContext* file_system_context,
|
| @@ -301,18 +302,18 @@ class LocalFileSyncContext
|
| const base::FilePath& local_path,
|
| const fileapi::FileSystemURL& url,
|
| const SyncStatusCallback& callback,
|
| - base::PlatformFileError error);
|
| + base::File::Error error);
|
|
|
| // Callback routine for ApplyRemoteChange.
|
| void DidApplyRemoteChange(
|
| const fileapi::FileSystemURL& url,
|
| const SyncStatusCallback& callback_on_ui,
|
| - base::PlatformFileError file_error);
|
| + base::File::Error file_error);
|
|
|
| void DidGetFileMetadata(
|
| const SyncFileMetadataCallback& callback,
|
| - base::PlatformFileError file_error,
|
| - const base::PlatformFileInfo& file_info);
|
| + base::File::Error file_error,
|
| + const base::File::Info& file_info);
|
|
|
| base::TimeDelta NotifyChangesDuration();
|
|
|
| @@ -321,7 +322,7 @@ class LocalFileSyncContext
|
| const base::FilePath& local_file_path,
|
| const fileapi::FileSystemURL& dest_url,
|
| const StatusCallback& callback,
|
| - base::PlatformFileError error);
|
| + base::File::Error error);
|
|
|
| const base::FilePath local_base_path_;
|
|
|
|
|