summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_manager_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/internal_api/sync_manager_impl.cc')
-rw-r--r--sync/internal_api/sync_manager_impl.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 168c19f..256a5c9 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -39,9 +39,6 @@
#include "sync/internal_api/sync_context_proxy_impl.h"
#include "sync/internal_api/syncapi_internal.h"
#include "sync/internal_api/syncapi_server_connection_manager.h"
-#include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/invalidator.h"
-#include "sync/notifier/object_id_invalidation_map.h"
#include "sync/protocol/proto_value_conversions.h"
#include "sync/protocol/sync.pb.h"
#include "sync/sessions/directory_type_debug_info_emitter.h"
@@ -170,7 +167,6 @@ SyncManagerImpl::SyncManagerImpl(const std::string& name)
change_delegate_(NULL),
initialized_(false),
observing_network_connectivity_changes_(false),
- invalidator_state_(DEFAULT_INVALIDATION_ERROR),
report_unrecoverable_error_function_(NULL),
weak_ptr_factory_(this) {
// Pre-fill |notification_info_map_|.
@@ -984,16 +980,12 @@ scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
return it->second->GetAllNodes();
}
-void SyncManagerImpl::OnInvalidatorStateChange(InvalidatorState state) {
+void SyncManagerImpl::SetInvalidatorEnabled(bool invalidator_enabled) {
DCHECK(thread_checker_.CalledOnValidThread());
- const std::string& state_str = InvalidatorStateToString(state);
- invalidator_state_ = state;
- DVLOG(1) << "Invalidator state changed to: " << state_str;
- const bool notifications_enabled =
- (invalidator_state_ == INVALIDATIONS_ENABLED);
- allstatus_.SetNotificationsEnabled(notifications_enabled);
- scheduler_->SetNotificationsEnabled(notifications_enabled);
+ DVLOG(1) << "Invalidator enabled state is now: " << invalidator_enabled;
+ allstatus_.SetNotificationsEnabled(invalidator_enabled);
+ scheduler_->SetNotificationsEnabled(invalidator_enabled);
}
void SyncManagerImpl::OnIncomingInvalidation(