diff options
author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 05:29:57 +0000 |
---|---|---|
committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 05:29:57 +0000 |
commit | f3141d2e1d4a2d58af5988400eb3ff9656fd8ad6 (patch) | |
tree | 017909cfc8d9d0c5cb4e65f0014cc77ec07ec135 /webkit | |
parent | 7d5881c9b9992a6bd291ac0ef5108204e8da35de (diff) | |
download | chromium_src-f3141d2e1d4a2d58af5988400eb3ff9656fd8ad6.zip chromium_src-f3141d2e1d4a2d58af5988400eb3ff9656fd8ad6.tar.gz chromium_src-f3141d2e1d4a2d58af5988400eb3ff9656fd8ad6.tar.bz2 |
Renaming fileapi::StatusCallback to fileapi::SyncStatusCallback
BUG=158732
TEST=none
Review URL: https://codereview.chromium.org/11275071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/fileapi/syncable/local_file_sync_context.cc | 6 | ||||
-rw-r--r-- | webkit/fileapi/syncable/local_file_sync_context.h | 8 | ||||
-rw-r--r-- | webkit/fileapi/syncable/sync_callbacks.h | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/webkit/fileapi/syncable/local_file_sync_context.cc b/webkit/fileapi/syncable/local_file_sync_context.cc index 9355997..c96bcd7 100644 --- a/webkit/fileapi/syncable/local_file_sync_context.cc +++ b/webkit/fileapi/syncable/local_file_sync_context.cc @@ -39,7 +39,7 @@ void LocalFileSyncContext::MaybeInitializeFileSystemContext( const GURL& source_url, const std::string& service_name, FileSystemContext* file_system_context, - const StatusCallback& callback) { + const SyncStatusCallback& callback) { DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); if (ContainsKey(file_system_contexts_, file_system_context)) { // The context has been already initialized. Just dispatch the callback @@ -123,7 +123,7 @@ void LocalFileSyncContext::ApplyRemoteChange( const FileChange& change, const FilePath& local_path, const FileSystemURL& url, - const StatusCallback& callback) { + const SyncStatusCallback& callback) { if (!io_task_runner_->RunsTasksOnCurrentThread()) { DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); io_task_runner_->PostTask( @@ -349,7 +349,7 @@ void LocalFileSyncContext::DidGetWritingStatusForPrepareForSync( } void LocalFileSyncContext::DidApplyRemoteChange( - const StatusCallback& callback_on_ui, + const SyncStatusCallback& callback_on_ui, base::PlatformFileError file_error) { DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); ui_task_runner_->PostTask( diff --git a/webkit/fileapi/syncable/local_file_sync_context.h b/webkit/fileapi/syncable/local_file_sync_context.h index ef7eacef..9c8d397 100644 --- a/webkit/fileapi/syncable/local_file_sync_context.h +++ b/webkit/fileapi/syncable/local_file_sync_context.h @@ -59,7 +59,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext void MaybeInitializeFileSystemContext(const GURL& source_url, const std::string& service_name, FileSystemContext* file_system_context, - const StatusCallback& callback); + const SyncStatusCallback& callback); // Called when the corresponding LocalFileSyncService exits. // This method must be called on UI thread. @@ -94,7 +94,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext const FileChange& change, const FilePath& local_path, const FileSystemURL& url, - const StatusCallback& callback); + const SyncStatusCallback& callback); // OperationRunner is accessible only on IO thread. base::WeakPtr<SyncableFileOperationRunner> operation_runner() const; @@ -108,7 +108,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext virtual void OnWriteEnabled(const FileSystemURL& url) OVERRIDE; private: - typedef std::deque<StatusCallback> StatusCallbackQueue; + typedef std::deque<SyncStatusCallback> StatusCallbackQueue; friend class base::RefCountedThreadSafe<LocalFileSyncContext>; friend class CannedSyncableFileSystem; @@ -143,7 +143,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext const ChangeListCallback& callback); void DidApplyRemoteChange( - const StatusCallback& callback_on_ui, + const SyncStatusCallback& callback_on_ui, base::PlatformFileError file_error); scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; diff --git a/webkit/fileapi/syncable/sync_callbacks.h b/webkit/fileapi/syncable/sync_callbacks.h index b1e8d20..f47e6ea 100644 --- a/webkit/fileapi/syncable/sync_callbacks.h +++ b/webkit/fileapi/syncable/sync_callbacks.h @@ -12,7 +12,9 @@ namespace fileapi { class FileSystemURL; -typedef base::Callback<void(SyncStatusCode status)> StatusCallback; +typedef base::Callback<void(SyncStatusCode status)> + SyncStatusCallback; + typedef base::Callback<void(SyncStatusCode status, const FileSystemURL& url)> SyncCompletionCallback; |