chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc - Issue 7190001: [Sync] Split DirectoryChangeListener for thread-safety

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7190001: [Sync] Split DirectoryChangeListener for thread-safety (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix copyright Created 9 years, 6 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 | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/conflict_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

index ee5873f480f95ddefcfa81eefdf6e8015255a79b..933dfee318e558be5308145fee3f852c7f86a411 100644

--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

@@ -11,6 +11,7 @@

#include "base/basictypes.h"

#include "base/format_macros.h"

+#include "base/tracked.h"

#include "chrome/browser/sync/engine/syncer_util.h"

#include "chrome/browser/sync/engine/update_applicator.h"

#include "chrome/browser/sync/sessions/sync_session.h"

@@ -43,7 +44,7 @@ bool BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSets(

return false;

bool had_single_direction_sets = false;

{ // Scope for transaction.

- syncable::WriteTransaction trans(dir, syncable::SYNCER, __FILE__, __LINE__);

+ syncable::WriteTransaction trans(dir, syncable::SYNCER, FROM_HERE);

BuildConflictSets(&trans,

session->status_controller()->mutable_conflict_progress());

had_single_direction_sets = ProcessSingleDirectionConflictSets(&trans,

« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/conflict_resolver.cc » ('j') | no next file with comments »