diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 01:43:26 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 01:43:26 +0000 |
| commit | 33b95c2d2e855dec947ff8e0cce4ece1cac4b1d8 (patch) | |
| tree | ff1e263165ccc73ab2fd720c612dc2d3a2fef11c /sync/engine/syncer.cc | |
| parent | 8ac8863e8fc4153586644e64f2f658d89ba57c30 (diff) | |
| download | chromium_src-33b95c2d2e855dec947ff8e0cce4ece1cac4b1d8.zip chromium_src-33b95c2d2e855dec947ff8e0cce4ece1cac4b1d8.tar.gz chromium_src-33b95c2d2e855dec947ff8e0cce4ece1cac4b1d8.tar.bz2 | |
[Sync] Add application logic for non-nigori control types.
We introduce logic to apply non-nigori control types. First, we iterate over
any new top level datatype entities, applying those. Then we go through the
rest of the unapplied control datatype updates, applying those. Any conflict
should be just a simple conflict, which we handle by ignoring the local
changes.
Also updates chromiumsync.py to support the new control types (and fixes
the parent folder pattern that was in use).
BUG=122825
Review URL: https://chromiumcodereview.appspot.com/11271009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/syncer.cc')
| -rw-r--r-- | sync/engine/syncer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index 22010ee..90d193a 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -144,7 +144,7 @@ bool Syncer::SyncShare(sessions::SyncSession* session, } case APPLY_UPDATES: { // These include encryption updates that should be applied early. - ApplyControlDataUpdates(session->context()->directory()); + ApplyControlDataUpdates(session); ApplyUpdatesAndResolveConflictsCommand apply_updates; apply_updates.Execute(session); |