| Index: chrome/browser/sync_file_system/drive_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| index 74b50642b7e77b028baf611cb55ecde55975c767..96729e6456f6264374197716f7a8a161f1d91cf8 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| @@ -65,7 +65,6 @@ class DriveFileSyncService : public RemoteFileSyncService,
|
|
|
| typedef base::Callback<void(const SyncStatusCallback& callback)> Task;
|
|
|
| - static const char kServiceName[];
|
| static ConflictResolutionPolicy kDefaultPolicy;
|
|
|
| virtual ~DriveFileSyncService();
|
| @@ -110,7 +109,6 @@ class DriveFileSyncService : public RemoteFileSyncService,
|
| virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE;
|
| virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE;
|
| virtual RemoteServiceState GetCurrentState() const OVERRIDE;
|
| - virtual const char* GetServiceName() const OVERRIDE;
|
| virtual void SetSyncEnabled(bool enabled) OVERRIDE;
|
| virtual SyncStatusCode SetConflictResolutionPolicy(
|
| ConflictResolutionPolicy resolution) OVERRIDE;
|
|
|