components/sync/api/conflict_resolution.h - Issue 2240613002: [Sync] Convert sync to a static library.

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: components/sync/api/conflict_resolution.h

Issue 2240613002: [Sync] Convert sync to a static library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Try getting rid of sync_core source set. Created 4 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: components/sync/api/conflict_resolution.h

diff --git a/components/sync/api/conflict_resolution.h b/components/sync/api/conflict_resolution.h

index 592fb5441d9ef33832473f94289fde85501edd9c..542910f5ab0d1f31e214947c97169047d25c9e58 100644

--- a/components/sync/api/conflict_resolution.h

+++ b/components/sync/api/conflict_resolution.h

@@ -15,7 +15,7 @@ namespace syncer_v2 {

// 1) Use the local client data and update the server.

// 2) Use the remote server data and update the client.

// 3) Use newly created data and update both.

-class SYNC_EXPORT ConflictResolution {

+class ConflictResolution {

public:

// This enum is used in histograms.xml and entries shouldn't be renumbered or

// removed. New entries must be added at the end, before TYPE_SIZE.