Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3597)

Unified Diff: chrome/browser/sync/engine/conflict_resolver.cc

Issue 338037: linux: fix gcc 4.3 issues (for arm) (Closed)
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncer_util.cc » ('j') | chrome/browser/sync/syncable/syncable.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/conflict_resolver.cc
diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
index a59facafe06772be8e4706b9e031c47c99d076d3..469d6829683fda730a80f0096769130fe3665c54 100644
--- a/chrome/browser/sync/engine/conflict_resolver.cc
+++ b/chrome/browser/sync/engine/conflict_resolver.cc
@@ -531,11 +531,12 @@ bool AttemptToFixUpdateEntryInDeletedLocalTree(WriteTransaction* trans,
id = parent.Get(syncable::PARENT_ID);
}
// If we find we've been looping we re-root the hierarchy.
- if (loop_detection < 0)
+ if (loop_detection < 0) {
if (id == entry.Get(syncable::ID))
reroot_id = entry.Get(syncable::PARENT_ID);
else
reroot_id = id;
+ }
// Now we fix things up by undeleting all the folders in the item's path.
id = parent_id;
while (!id.IsRoot() && id != reroot_id) {
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncer_util.cc » ('j') | chrome/browser/sync/syncable/syncable.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698