Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(945)

Unified Diff: chrome/browser/sync/engine/syncer_thread_adapter.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: fix 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
« no previous file with comments | « chrome/browser/sync/engine/syncer_thread2_unittest.cc ('k') | chrome/browser/sync/engine/syncer_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_thread_adapter.cc
diff --git a/chrome/browser/sync/engine/syncer_thread_adapter.cc b/chrome/browser/sync/engine/syncer_thread_adapter.cc
index 174e49a56d1df723fc0a02148de63aba27e195f0..04d3862c817a09be5bc503c0d90b7bbc68acb7cc 100644
--- a/chrome/browser/sync/engine/syncer_thread_adapter.cc
+++ b/chrome/browser/sync/engine/syncer_thread_adapter.cc
@@ -16,7 +16,7 @@ SyncerThreadAdapter::SyncerThreadAdapter(sessions::SyncSessionContext* context,
: legacy_(NULL), new_impl_(NULL), using_new_impl_(using_new_impl) {
if (using_new_impl_) {
new_impl_.reset(new s3::SyncerThread(context, new Syncer()));
- new_impl_->Start(s3::SyncerThread::CONFIGURATION_MODE);
+ new_impl_->Start(s3::SyncerThread::CONFIGURATION_MODE, NULL);
} else {
legacy_ = new SyncerThread(context);
}
@@ -35,7 +35,7 @@ void SyncerThreadAdapter::WatchConnectionManager(
bool SyncerThreadAdapter::Start() {
if (using_new_impl_) {
- new_impl_->Start(s3::SyncerThread::NORMAL_MODE);
+ new_impl_->Start(s3::SyncerThread::NORMAL_MODE, NULL);
return true;
} else {
return legacy_->Start();
« no previous file with comments | « chrome/browser/sync/engine/syncer_thread2_unittest.cc ('k') | chrome/browser/sync/engine/syncer_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698