chrome/browser/sync/engine/conflict_resolver.h - 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.h

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.h

diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h

index 672f30aaad889ce7ca1d17340f653a720b91f648..9bec0d530359e6117ea1f1df59ae16880498f066 100644

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

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

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

#include "base/basictypes.h"

#include "base/gtest_prod_util.h"

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

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

namespace syncable {

class BaseTransaction;