| Index: chrome/browser/sync_file_system/local/local_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.h b/chrome/browser/sync_file_system/local/local_file_sync_service.h
|
| index 86414d5eac633a017aa6efa98f547ac8ad8646d6..dbf24c5cd1a688bd66acb47db88f67cc65c754ee 100644
|
| --- a/chrome/browser/sync_file_system/local/local_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.h
|
| @@ -74,7 +74,7 @@ class LocalFileSyncService
|
| static scoped_ptr<LocalFileSyncService> CreateForTesting(
|
| Profile* profile,
|
| leveldb::Env* env_override);
|
| - virtual ~LocalFileSyncService();
|
| + ~LocalFileSyncService() override;
|
|
|
| void Shutdown();
|
|
|
| @@ -129,25 +129,22 @@ class LocalFileSyncService
|
| const SyncFileMetadataCallback& callback);
|
|
|
| // RemoteChangeProcessor overrides.
|
| - virtual void PrepareForProcessRemoteChange(
|
| + void PrepareForProcessRemoteChange(
|
| const storage::FileSystemURL& url,
|
| const PrepareChangeCallback& callback) override;
|
| - virtual void ApplyRemoteChange(const FileChange& change,
|
| - const base::FilePath& local_path,
|
| - const storage::FileSystemURL& url,
|
| - const SyncStatusCallback& callback) override;
|
| - virtual void FinalizeRemoteSync(
|
| - const storage::FileSystemURL& url,
|
| - bool clear_local_changes,
|
| - const base::Closure& completion_callback) override;
|
| - virtual void RecordFakeLocalChange(
|
| - const storage::FileSystemURL& url,
|
| - const FileChange& change,
|
| - const SyncStatusCallback& callback) override;
|
| + void ApplyRemoteChange(const FileChange& change,
|
| + const base::FilePath& local_path,
|
| + const storage::FileSystemURL& url,
|
| + const SyncStatusCallback& callback) override;
|
| + void FinalizeRemoteSync(const storage::FileSystemURL& url,
|
| + bool clear_local_changes,
|
| + const base::Closure& completion_callback) override;
|
| + void RecordFakeLocalChange(const storage::FileSystemURL& url,
|
| + const FileChange& change,
|
| + const SyncStatusCallback& callback) override;
|
|
|
| // LocalOriginChangeObserver override.
|
| - virtual void OnChangesAvailableInOrigins(
|
| - const std::set<GURL>& origins) override;
|
| + void OnChangesAvailableInOrigins(const std::set<GURL>& origins) override;
|
|
|
| // Called when a particular origin (app) is disabled/enabled while
|
| // the service is running. This may be called for origins/apps that
|
|
|