| Index: chrome/browser/sync/glue/sync_backend_host.h
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
|
| index ee3fd68c67241c4ae19937ec5cb1a2567d2714e0..843540f1814295e8800bff1742a94bc71ca5672d 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host.h
|
| +++ b/chrome/browser/sync/glue/sync_backend_host.h
|
| @@ -344,13 +344,12 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
|
| // syncing (generally after initialization and authentication).
|
| void DoStartSyncing();
|
|
|
| - // Called on the SyncBackendHost sync_thread_ to nudge/pause/resume the
|
| - // syncer.
|
| - void DoRequestNudge(const tracked_objects::Location& location);
|
| + // Called on the SyncBackendHost sync_thread_ to clear server
|
| + // data.
|
| void DoRequestClearServerData();
|
|
|
| - // Sets |deferred_nudge_for_cleanup_requested_| to true. See comment below.
|
| - void DeferNudgeForCleanup();
|
| + // Sets |deferred_cleanup_requested_| to true. See comment below.
|
| + void DeferCleanup();
|
|
|
| // Called on our SyncBackendHost's |sync_thread_| to set the passphrase
|
| // on behalf of SyncBackendHost::SupplyPassphrase.
|
| @@ -519,7 +518,8 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
|
|
|
| // True when a datatype has been disabled so that we nudge once sync is
|
| // resumed (after configuration is finished).
|
| - bool deferred_nudge_for_cleanup_requested_;
|
| + // TODO(akalin): Remove the need for this.
|
| + bool deferred_cleanup_requested_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Core);
|
| };
|
| @@ -529,9 +529,6 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
|
| // set up initial conditions.
|
| virtual void HandleInitializationCompletedOnFrontendLoop(bool success);
|
|
|
| - // Posts a nudge request on the sync thread.
|
| - virtual void RequestNudge(const tracked_objects::Location& location);
|
| -
|
| // Called to finish the job of ConfigureDataTypes once the syncer is in
|
| // configuration mode.
|
| void FinishConfigureDataTypes();
|
|
|