| Index: chrome/browser/sync/engine/syncer.h
|
| diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h
|
| index bbcbb3b722632632d42614d9465acd8780985561..b9deb2339153234cac98e7ae4e6a353e8a9943da 100644
|
| --- a/chrome/browser/sync/engine/syncer.h
|
| +++ b/chrome/browser/sync/engine/syncer.h
|
| @@ -56,7 +56,7 @@ enum SyncerStep {
|
| BUILD_AND_PROCESS_CONFLICT_SETS,
|
| RESOLVE_CONFLICTS,
|
| APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
|
| - CLEAR_PRIVATE_DATA,
|
| + CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'.
|
| SYNCER_END
|
| };
|
|
|
| @@ -84,23 +84,22 @@ class Syncer {
|
| bool ExitRequested();
|
| void RequestEarlyExit();
|
|
|
| + // TODO(tim): Deprecated.
|
| // Cause one sync cycle to occur. Like a good parent, it is the caller's
|
| // responsibility to clean up after the syncer when it finishes a sync share
|
| // operation and honor server mandated throttles.
|
| virtual void SyncShare(sessions::SyncSession* session);
|
|
|
| + // Like SyncShare() above, but |first_step| and |last_step| are provided to
|
| + // perform a partial sync cycle, stopping after |last_step| is performed.
|
| + virtual void SyncShare(sessions::SyncSession* session,
|
| + SyncerStep first_step,
|
| + SyncerStep last_step);
|
| +
|
| private:
|
| // Implements the PROCESS_CLIENT_COMMAND syncer step.
|
| void ProcessClientCommand(sessions::SyncSession *session);
|
|
|
| - // This is the bottom-most SyncShare variant, and does not cause transient
|
| - // state to be reset in session.
|
| - // Like SyncShare(), but |first_step| and |last_step| are provided to perform
|
| - // a partial sync cycle, stopping after |last_step| is performed.
|
| - void SyncShare(sessions::SyncSession* session,
|
| - SyncerStep first_step,
|
| - SyncerStep last_step);
|
| -
|
| bool early_exit_requested_;
|
| base::Lock early_exit_requested_lock_;
|
|
|
|
|