Chromium Code Reviews| Index: chrome/browser/sync/internal_api/sync_manager.cc |
| diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc |
| index a0611b00597cd5bb9458385421ea839654026766..264b0d01147a81163457092bf96896190dcab5af 100644 |
| --- a/chrome/browser/sync/internal_api/sync_manager.cc |
| +++ b/chrome/browser/sync/internal_api/sync_manager.cc |
| @@ -24,6 +24,7 @@ |
| #include "chrome/browser/sync/internal_api/base_node.h" |
| #include "chrome/browser/sync/internal_api/change_reorder_buffer.h" |
| #include "chrome/browser/sync/internal_api/configure_reason.h" |
| +#include "chrome/browser/sync/internal_api/debug_info_event_listener.h" |
| #include "chrome/browser/sync/internal_api/read_node.h" |
| #include "chrome/browser/sync/internal_api/read_transaction.h" |
| #include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h" |
| @@ -50,6 +51,8 @@ |
| #include "chrome/common/chrome_switches.h" |
| #include "net/base/network_change_notifier.h" |
| +#include "chrome/browser/sync/internal_api/debug_info_event_listener.cc" |
|
tim (not reviewing)
2011/10/14 01:23:21
yikes... pretty sure you meant to remove this :)
lipalani1
2011/10/14 18:31:10
Done.
|
| + |
| using std::string; |
| using base::TimeDelta; |
| @@ -136,7 +139,8 @@ class SyncManager::SyncInternal |
| initialized_(false), |
| setup_for_test_mode_(false), |
| observing_ip_address_changes_(false), |
| - created_on_loop_(MessageLoop::current()) { |
| + created_on_loop_(MessageLoop::current()), |
| + debug_info_event_listener_() { |
|
tim (not reviewing)
2011/10/14 01:23:21
this initializer isn't needed, right?
lipalani1
2011/10/14 18:31:10
Done.
|
| // Pre-fill |notification_info_map_|. |
| for (int i = syncable::FIRST_REAL_MODEL_TYPE; |
| i < syncable::MODEL_TYPE_COUNT; ++i) { |
| @@ -551,6 +555,9 @@ class SyncManager::SyncInternal |
| JsSyncManagerObserver js_sync_manager_observer_; |
| JsMutationEventObserver js_mutation_event_observer_; |
| + // This is for keeping track of client events to send to the server. |
| + DebugInfoEventListener debug_info_event_listener_; |
| + |
| MessageLoop* const created_on_loop_; |
| }; |
| const int SyncManager::SyncInternal::kDefaultNudgeDelayMilliseconds = 200; |
| @@ -766,6 +773,8 @@ bool SyncManager::SyncInternal::Init( |
| AddObserver(&js_sync_manager_observer_); |
| SetJsEventHandler(event_handler); |
| + AddObserver(&debug_info_event_listener_); |
| + |
| share_.dir_manager.reset(new DirectoryManager(database_location)); |
| connection_manager_.reset(new SyncAPIServerConnectionManager( |
| @@ -787,7 +796,8 @@ bool SyncManager::SyncInternal::Init( |
| connection_manager_.get(), |
| dir_manager(), |
| model_safe_worker_registrar, |
| - listeners); |
| + listeners, |
| + &debug_info_event_listener_); |
| context->set_account_name(credentials.email); |
| // The SyncScheduler takes ownership of |context|. |
| scheduler_.reset(new SyncScheduler(name_, context, new Syncer())); |
| @@ -1271,6 +1281,8 @@ void SyncManager::SyncInternal::ShutdownOnSyncThread() { |
| SetJsEventHandler(WeakHandle<JsEventHandler>()); |
| RemoveObserver(&js_sync_manager_observer_); |
| + RemoveObserver(&debug_info_event_listener_); |
| + |
| if (sync_notifier_.get()) { |
| sync_notifier_->RemoveObserver(this); |
| } |