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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 351026: Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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 | « chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc ('k') | chrome/browser/sync/engine/syncer_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/conflict_resolver.cc
===================================================================
--- chrome/browser/sync/engine/conflict_resolver.cc (revision 30625)
+++ chrome/browser/sync/engine/conflict_resolver.cc (working copy)
@@ -312,7 +312,7 @@
server_named->Put(syncable::BASE_VERSION, 0);
CHECK(SUCCESS ==
SyncerUtil::AttemptToUpdateEntryWithoutMerge(
- trans, locally_named, NULL, NULL));
+ trans, locally_named, NULL));
return true;
}
« no previous file with comments | « chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc ('k') | chrome/browser/sync/engine/syncer_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698