chrome/browser/sync/engine/syncer.cc - Issue 6690020: sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

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: chrome/browser/sync/engine/syncer.cc

Issue 6690020: sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/debug

Patch Set: rebase Created 9 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:

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

Download patch

« chrome/browser/sync/engine/syncapi.cc ('K') | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/engine/syncer_end_command.cc » ('j') | chrome/browser/sync/engine/syncer_thread2.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/syncer.cc

diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc

index ac206006c51e6e19be51ee5e107c501df4c15c71..2f24ee1b27706d7ffedd965076f1bf258e2efce8 100644

--- a/chrome/browser/sync/engine/syncer.cc

+++ b/chrome/browser/sync/engine/syncer.cc

@@ -271,9 +271,6 @@ void Syncer::SyncShare(sessions::SyncSession* session,

break;

}

case SYNCER_END: {

- VLOG(1) << "Syncer End";

- SyncerEndCommand syncer_end_command;

- syncer_end_command.Execute(session);

break;

}

default:

@@ -284,11 +281,9 @@ void Syncer::SyncShare(sessions::SyncSession* session,

current_step = next_step;

}

- // Always send out a cycle ended notification, regardless of end-state.

- SyncEngineEvent event(SyncEngineEvent::SYNC_CYCLE_ENDED);

- sessions::SyncSessionSnapshot snapshot(session->TakeSnapshot());

- event.snapshot = &snapshot;

- session->context()->NotifyListeners(event);

+ VLOG(1) << "Syncer End";

+ SyncerEndCommand syncer_end_command;

+ syncer_end_command.Execute(session);

return;

}