chrome/browser/sync/engine/conflict_resolver.cc - Issue 9668028: [Sync] Create new top-level sync/ directory

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 9668028: [Sync] Create new top-level sync/ directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync to head Created 8 years, 9 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 c608ba56f628f880ae53fbd41f27b81edde3550a..b91e8d17740d004b11151bbed6545d6c9a014b6d 100644

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

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

@@ -13,11 +13,11 @@

#include "base/metrics/histogram.h"

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

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

-#include "chrome/browser/sync/protocol/nigori_specifics.pb.h"

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

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

#include "chrome/browser/sync/syncable/syncable.h"

#include "chrome/browser/sync/util/cryptographer.h"

+#include "sync/protocol/nigori_specifics.pb.h"

using std::list;

using std::map;