| Index: chrome/browser/sync_file_system/drive_backend/sync_worker.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.h b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
|
| index 357e77386dbe59bf9b4d29857a37891cd5b442fc..bdc9d7396a8086ce6bd51b2f54515dde7fdbb7ef 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_worker.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
|
| @@ -105,6 +105,7 @@ class SyncWorker : public SyncTaskManager::Client {
|
| scoped_ptr<base::ListValue> DumpFiles(const GURL& origin);
|
| scoped_ptr<base::ListValue> DumpDatabase();
|
| void SetSyncEnabled(bool enabled);
|
| + void PromoteDemotedChanges();
|
| SyncStatusCode SetDefaultConflictResolutionPolicy(
|
| ConflictResolutionPolicy policy);
|
| SyncStatusCode SetConflictResolutionPolicy(
|
|
|