diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:47:37 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:47:37 +0000 |
| commit | b99f548508aa6ae45b0f215cf2f8c8679c7d7cdd (patch) | |
| tree | 4053c5a4da94b3d6f6366c39fae4277be806a72f /sync/internal_api/public | |
| parent | cc25dd0cd7c0a18d6abe7f0dcf0f4b31e45cd3fb (diff) | |
| download | chromium_src-b99f548508aa6ae45b0f215cf2f8c8679c7d7cdd.zip chromium_src-b99f548508aa6ae45b0f215cf2f8c8679c7d7cdd.tar.gz chromium_src-b99f548508aa6ae45b0f215cf2f8c8679c7d7cdd.tar.bz2 | |
sync: Move migration signal out of snapshot
A sync data migration request is signalled by the server during a normal
GetUpdates or Commit request. The signal is then forwarded to the UI thread,
which actually performs the migration.
Traditionally, the signal has been sent through the SyncSessionSnapshot, which
is delivered to the UI thread at the end of the current sync cycle. This CL
introduces new code to pass the signal through the SyncSession::Delegate and
SyncManagerObserverInterfaces.
This CL should not change the syncer's behavior.
BUG=339984
Review URL: https://codereview.chromium.org/158953004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public')
| -rw-r--r-- | sync/internal_api/public/sessions/model_neutral_state.h | 4 | ||||
| -rw-r--r-- | sync/internal_api/public/sync_manager.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h index beafcb9..d85d039 100644 --- a/sync/internal_api/public/sessions/model_neutral_state.h +++ b/sync/internal_api/public/sessions/model_neutral_state.h @@ -35,10 +35,6 @@ struct SYNC_EXPORT ModelNeutralState { int num_tombstone_updates_downloaded_total; int num_reflected_updates_downloaded_total; - // If the syncer encountered a MIGRATION_DONE code, these are the types that - // the client must now "migrate", by purging and re-downloading all updates. - ModelTypeSet types_needing_local_migration; - // Update application and conflicts. int num_updates_applied; int num_encryption_conflicts; diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h index 54e12b6..b90c597 100644 --- a/sync/internal_api/public/sync_manager.h +++ b/sync/internal_api/public/sync_manager.h @@ -222,6 +222,8 @@ class SYNC_EXPORT SyncManager : public syncer::InvalidationHandler { virtual void OnActionableError( const SyncProtocolError& sync_protocol_error) = 0; + virtual void OnMigrationRequested(ModelTypeSet types) = 0; + protected: virtual ~Observer(); }; |