components/sync/engine_impl/commit_util.cc - Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match.

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/engine_impl/commit_util.cc

Issue 2258873003: [Sync] Move sessions/ to engine/cycle/ and rename things to match. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. 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:

View side-by-side diff with in-line comments

Download patch

Index: components/sync/engine_impl/commit_util.cc

diff --git a/components/sync/engine_impl/commit_util.cc b/components/sync/engine_impl/commit_util.cc

index a2c2a4a8a971461923c592a10e360e17d9c485fb..8eeef48b9cbbb5229b4945a55771f25dae3db22e 100644

--- a/components/sync/engine_impl/commit_util.cc

+++ b/components/sync/engine_impl/commit_util.cc

@@ -19,7 +19,6 @@

#include "components/sync/engine_impl/syncer_proto_util.h"

#include "components/sync/protocol/bookmark_specifics.pb.h"

#include "components/sync/protocol/sync.pb.h"

-#include "components/sync/sessions_impl/sync_session.h"

#include "components/sync/syncable/directory.h"

#include "components/sync/syncable/entry.h"

#include "components/sync/syncable/model_neutral_mutable_entry.h"

@@ -51,7 +50,7 @@ void AddExtensionsActivityToMessage(

// We will push this list of extensions activity back into the

// ExtensionsActivityMonitor if this commit fails. That's why we must keep a

- // copy of these records in the session.

+ // copy of these records in the cycle.

activity->GetAndClearRecords(extensions_activity_buffer);

const ExtensionsActivity::Records& records = *extensions_activity_buffer;

« no previous file with comments | « components/sync/engine_impl/commit_contribution.h ('k') | components/sync/engine_impl/conflict_resolver.h » ('j') | no next file with comments »