components/sync/api/conflict_resolution.cc - Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2.

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

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)

Patch Set: Rebase. Created 4 years, 2 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.cc

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

index d1d317edfca42f278dff4577097e77d45275d8c3..7486f7aa0065b7f59c7bae3819656df569c4942f 100644

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

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

@@ -4,7 +4,7 @@

#include "components/sync/api/conflict_resolution.h"

-namespace syncer_v2 {

+namespace syncer {

// static

ConflictResolution ConflictResolution::UseLocal() {

@@ -38,4 +38,4 @@ ConflictResolution::ConflictResolution(Type type,

std::unique_ptr<EntityData> data)

: type_(type), data_(std::move(data)) {}

-} // namespace syncer_v2

+} // namespace syncer

« no previous file with comments | « components/sync/api/conflict_resolution.h ('k') | components/sync/api/data_batch.h » ('j') | no next file with comments »