chrome/browser/sync/engine/conflict_resolver.cc - Issue 7587009: sync: add DEPS files to subdirs

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 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix include Created 9 years, 4 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 3df973c2f1b79b85b31d4b395bbeea6380551d95..97596ef10d201bc0ac65c734db19fdf5dd58cdd0 100644

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

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

@@ -16,7 +16,6 @@

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

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

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

-#include "chrome/common/deprecated/event_sys-inl.h"

using std::map;

using std::set;