sync/engine/conflict_resolver.h - Issue 9699057: [Sync] Move 'sync' target to sync/

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments 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: sync/engine/conflict_resolver.h

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

similarity index 92%

rename from chrome/browser/sync/engine/conflict_resolver.h

rename to sync/engine/conflict_resolver.h

index f365255c32fb0cefa3172d272ecca1fe884ad0df..d2d89d099c65e9faae2bba6fd30a047cb34effba 100644

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

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

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

// A class that watches the syncer and attempts to resolve any conflicts that

// occur.

-#ifndef CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_

-#define CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_

+#ifndef SYNC_ENGINE_CONFLICT_RESOLVER_H_

+#define SYNC_ENGINE_CONFLICT_RESOLVER_H_

#pragma once

#include <map>

@@ -15,7 +15,7 @@

#include "base/basictypes.h"

#include "base/gtest_prod_util.h"

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

+#include "sync/engine/syncer_types.h"

namespace syncable {

class BaseTransaction;

@@ -86,4 +86,4 @@ class ConflictResolver {

} // namespace browser_sync

-#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_

+#endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_

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