diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 21:39:54 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 21:42:55 +0000 |
| commit | 27a57c8b57b8299bfb4786759735becc4a77e63e (patch) | |
| tree | 5706a6c6272aa0d90fad20f27db6c53d16819cef /sync/engine | |
| parent | 9a6fb22f348594098cc5a38329454ca19ce45867 (diff) | |
| download | chromium_src-27a57c8b57b8299bfb4786759735becc4a77e63e.zip chromium_src-27a57c8b57b8299bfb4786759735becc4a77e63e.tar.gz chromium_src-27a57c8b57b8299bfb4786759735becc4a77e63e.tar.bz2 | |
[Sync] Move reenable logic into DTM
The DataTypeManager is now in charge of reenabling previously failed types.
BUG=368834
R=maniscalco@chromium.org
Review URL: https://codereview.chromium.org/439903002
Cr-Commit-Position: refs/heads/master@{#291198}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
| -rw-r--r-- | sync/engine/get_updates_delegate.cc | 2 | ||||
| -rw-r--r-- | sync/engine/sync_scheduler_impl.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sync/engine/get_updates_delegate.cc b/sync/engine/get_updates_delegate.cc index ac66eef..af4ad57 100644 --- a/sync/engine/get_updates_delegate.cc +++ b/sync/engine/get_updates_delegate.cc @@ -136,6 +136,8 @@ ConfigureGetUpdatesDelegate::ConvertConfigureSourceToOrigin( return sync_pb::SyncEnums::RECONFIGURATION; case sync_pb::GetUpdatesCallerInfo::NEW_CLIENT: return sync_pb::SyncEnums::NEW_CLIENT; + case sync_pb::GetUpdatesCallerInfo::PROGRAMMATIC: + return sync_pb::SyncEnums::PROGRAMMATIC; default: NOTREACHED(); return sync_pb::SyncEnums::UNKNOWN_ORIGIN; diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc index 974ed27..7b07815 100644 --- a/sync/engine/sync_scheduler_impl.cc +++ b/sync/engine/sync_scheduler_impl.cc @@ -143,6 +143,7 @@ bool IsConfigRelatedUpdateSourceValue( case GetUpdatesCallerInfo::MIGRATION: case GetUpdatesCallerInfo::NEW_CLIENT: case GetUpdatesCallerInfo::NEWLY_SUPPORTED_DATATYPE: + case GetUpdatesCallerInfo::PROGRAMMATIC: return true; default: return false; |