diff options
Diffstat (limited to 'chrome/browser/sync/engine/syncer_thread_pthreads.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread_pthreads.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread_pthreads.cc b/chrome/browser/sync/engine/syncer_thread_pthreads.cc index 9fdfb21..4088694 100644 --- a/chrome/browser/sync/engine/syncer_thread_pthreads.cc +++ b/chrome/browser/sync/engine/syncer_thread_pthreads.cc @@ -138,20 +138,24 @@ SyncerThreadPthreadImpl::SyncerThreadPthreadImpl( ServerConnectionManager* connection_manager, AllStatus* all_status, ModelSafeWorker* model_safe_worker) - : dirman_(mgr), scm_(connection_manager), - syncer_(NULL), syncer_events_(NULL), thread_running_(false), + : stop_syncer_thread_(false), + thread_running_(false), + connected_(false), + p2p_authenticated_(false), + p2p_subscribed_(false), + allstatus_(all_status), + syncer_(NULL), + dirman_(mgr), + scm_(connection_manager), syncer_short_poll_interval_seconds_( SyncerThread::kDefaultShortPollIntervalSeconds), syncer_long_poll_interval_seconds_( SyncerThread::kDefaultLongPollIntervalSeconds), syncer_polling_interval_(SyncerThread::kDefaultShortPollIntervalSeconds), syncer_max_interval_(SyncerThread::kDefaultMaxPollIntervalMs), - stop_syncer_thread_(false), connected_(false), conn_mgr_hookup_(NULL), - p2p_authenticated_(false), p2p_subscribed_(false), - allstatus_(all_status), talk_mediator_hookup_(NULL), - command_channel_(command_channel), directory_manager_hookup_(NULL), + command_channel_(command_channel), model_safe_worker_(model_safe_worker), - client_command_hookup_(NULL), disable_idle_detection_(false) { + disable_idle_detection_(false) { SyncerEvent shutdown = { SyncerEvent::SHUTDOWN_USE_WITH_CARE }; syncer_event_channel_.reset(new SyncerEventChannel(shutdown)); @@ -575,4 +579,4 @@ void SyncerThreadPthreadImpl::HandleTalkMediatorEvent( } } -} // namespace browser_sync
\ No newline at end of file +} // namespace browser_sync |