chrome/browser/sync/engine/conflict_resolver.cc - Issue 7879006: Delete Tracked, and move Location to its own file.

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/conflict_resolver.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 9 years, 3 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:

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 918b45ff023761b77b5fa00f49a16f0297cb9c5e..25c2e18e51d25a3eb20d462064a0d247138411db 100644

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

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

@@ -8,8 +8,8 @@

#include <map>

#include <set>

+#include "base/location.h"

#include "base/metrics/histogram.h"

-#include "base/tracked.h"

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

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

#include "chrome/browser/sync/protocol/service_constants.h"