summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/syncer.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 19:13:19 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 19:13:19 +0000
commitc8ee99efa1bdd2d47abb70fd96571f041add7983 (patch)
tree7e62edaea65b46386fc9e879b0695f935c0fb9aa /chrome/browser/sync/engine/syncer.cc
parentc4daddcf734bc087796f5f8a2a7d47b50a42552b (diff)
downloadchromium_src-c8ee99efa1bdd2d47abb70fd96571f041add7983.zip
chromium_src-c8ee99efa1bdd2d47abb70fd96571f041add7983.tar.gz
chromium_src-c8ee99efa1bdd2d47abb70fd96571f041add7983.tar.bz2
sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends
This permits the thread to initiate syncing by waiting for valid network connectivity. Adds a callback to SyncerThread2::Start to learn when config mode has started. Makes ConfigureDataTypes asynchronous to allow waiting for config mode to have started. As a result of this, passing --new-syncer-thread on the command line actually works and doesn't crash (too much!) BUG=26339 TEST=SyncerThread2Test Review URL: http://codereview.chromium.org/6690020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncer.cc')
-rw-r--r--chrome/browser/sync/engine/syncer.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc
index ac20600..2f24ee1 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;
}