| Index: chrome/browser/sync_file_system/drive_backend/sync_engine.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
|
| index e8e354a04e552967c5267f73bf2a0fa39da3e429..eb628d82ff549e91b445a3641675235fc5302edb 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
|
| @@ -128,12 +128,11 @@ class SyncEngine : public RemoteFileSyncService,
|
| virtual void PromoteDemotedChanges(const base::Closure& callback) OVERRIDE;
|
|
|
| // LocalChangeProcessor overrides.
|
| - virtual void ApplyLocalChange(
|
| - const FileChange& local_change,
|
| - const base::FilePath& local_path,
|
| - const SyncFileMetadata& local_metadata,
|
| - const fileapi::FileSystemURL& url,
|
| - const SyncStatusCallback& callback) OVERRIDE;
|
| + virtual void ApplyLocalChange(const FileChange& local_change,
|
| + const base::FilePath& local_path,
|
| + const SyncFileMetadata& local_metadata,
|
| + const storage::FileSystemURL& url,
|
| + const SyncStatusCallback& callback) OVERRIDE;
|
|
|
| // drive::DriveNotificationObserver overrides.
|
| virtual void OnNotificationReceived() OVERRIDE;
|
| @@ -174,7 +173,7 @@ class SyncEngine : public RemoteFileSyncService,
|
|
|
| // Called by WorkerObserver.
|
| void OnPendingFileListUpdated(int item_count);
|
| - void OnFileStatusChanged(const fileapi::FileSystemURL& url,
|
| + void OnFileStatusChanged(const storage::FileSystemURL& url,
|
| SyncFileStatus file_status,
|
| SyncAction sync_action,
|
| SyncDirection direction);
|
|
|