diff options
| author | stanisc <stanisc@chromium.org> | 2015-10-28 21:21:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 04:22:00 +0000 |
| commit | 8668a737457e7ea680b6fb711060c2148e8e43e0 (patch) | |
| tree | d1ad5eb2fa21e81e0c88bde178a1ecdc1e950e96 /sync/sessions | |
| parent | df1b42bbd9dd720b133f83a1b4b2bb854ff3bc9d (diff) | |
| download | chromium_src-8668a737457e7ea680b6fb711060c2148e8e43e0.zip chromium_src-8668a737457e7ea680b6fb711060c2148e8e43e0.tar.gz chromium_src-8668a737457e7ea680b6fb711060c2148e8e43e0.tar.bz2 | |
Sync: Conflict resolution code doesn't take into account implicit permanent folders
The code that resolves simple conflicts detect the type of conflict
incorrectly when occurs during transition to implicit root folder, when
Parent ID changes from root folder ID to an empty string.
This shouldn't be considered a hierarchy change as far as conflict type
detection is concerned.
BUG=548734
Review URL: https://codereview.chromium.org/1414663008
Cr-Commit-Position: refs/heads/master@{#356764}
Diffstat (limited to 'sync/sessions')
| -rw-r--r-- | sync/sessions/status_controller.cc | 4 | ||||
| -rw-r--r-- | sync/sessions/status_controller.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sync/sessions/status_controller.cc b/sync/sessions/status_controller.cc index acb7f73..6f0f1ee 100644 --- a/sync/sessions/status_controller.cc +++ b/sync/sessions/status_controller.cc @@ -101,6 +101,10 @@ int StatusController::num_server_overwrites() const { return model_neutral_.num_server_overwrites; } +int StatusController::num_local_overwrites() const { + return model_neutral_.num_local_overwrites; +} + int StatusController::num_encryption_conflicts() const { return model_neutral_.num_encryption_conflicts; } diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h index eea5872..b6f1003 100644 --- a/sync/sessions/status_controller.h +++ b/sync/sessions/status_controller.h @@ -55,6 +55,7 @@ class SYNC_EXPORT_PRIVATE StatusController { int num_updates_applied() const; int num_server_overwrites() const; + int num_local_overwrites() const; // The time at which we started the first sync cycle in this session. base::Time sync_start_time() const { |