components/sync/engine_impl/directory_commit_contribution.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/directory_commit_contribution.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

« no previous file with comments | « components/sync/engine_impl/directory_commit_contribution.h ('k') | components/sync/engine_impl/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync/engine_impl/directory_commit_contribution.cc

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

index 514bedbd1c839944cabe11ac82752ca438138911..4efdcf50d8109e23872a81d63f0b2e3ce329357c 100644

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

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

@@ -10,10 +10,10 @@

#include <algorithm>

#include <set>

+#include "components/sync/engine/cycle/commit_counters.h"

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

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

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

-#include "components/sync/sessions/commit_counters.h"

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

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

@@ -75,7 +75,7 @@ void DirectoryCommitContribution::AddToCommitMessage(

SyncerError DirectoryCommitContribution::ProcessCommitResponse(

const sync_pb::ClientToServerResponse& response,

- sessions::StatusController* status) {

+ StatusController* status) {

DCHECK(syncing_bits_set_);

const sync_pb::CommitResponse& commit_response = response.commit();