Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6957)

Unified Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h

Issue 297803011: [SyncFS] Run LocalToRemoteSyncer as SyncTask (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
index c173eb3688e2bfafdbca6171ecdba78db2d5a965..69433d126c51e51fbd4f64b5ec30215063d732c2 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h
@@ -38,7 +38,7 @@ class FolderCreator;
class MetadataDatabase;
class SyncEngineContext;
-class LocalToRemoteSyncer : public ExclusiveTask {
+class LocalToRemoteSyncer : public SyncTask {
public:
LocalToRemoteSyncer(SyncEngineContext* sync_context,
const SyncFileMetadata& local_metadata,
@@ -46,7 +46,8 @@ class LocalToRemoteSyncer : public ExclusiveTask {
const base::FilePath& local_path,
const fileapi::FileSystemURL& url);
virtual ~LocalToRemoteSyncer();
- virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE;
+ virtual void RunPreflight(scoped_ptr<SyncTaskToken> token) OVERRIDE;
+ void RunExclusive(scoped_ptr<SyncTaskToken> token);
const fileapi::FileSystemURL& url() const { return url_; }
const base::FilePath& target_path() const { return target_path_; }
@@ -56,7 +57,7 @@ class LocalToRemoteSyncer : public ExclusiveTask {
}
private:
- void SyncCompleted(const SyncStatusCallback& callback,
+ void SyncCompleted(scoped_ptr<SyncTaskToken> token,
SyncStatusCode status);
void HandleConflict(const SyncStatusCallback& callback);

Powered by Google App Engine
This is Rietveld 408576698