diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 12:34:36 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 12:34:36 +0000 |
| commit | 4b773fc537e937aab56bc8754a77dc650684bfa7 (patch) | |
| tree | 6773dc320bfd451c0b6ccecb0054746fa46743ab /sync/internal_api/sync_manager_impl.cc | |
| parent | 7d623f0026af4962e279969e7df5080de74e7e34 (diff) | |
| download | chromium_src-4b773fc537e937aab56bc8754a77dc650684bfa7.zip chromium_src-4b773fc537e937aab56bc8754a77dc650684bfa7.tar.gz chromium_src-4b773fc537e937aab56bc8754a77dc650684bfa7.tar.bz2 | |
Revert r148496 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"
It broke sync_integration_tests:
TwoClientExtensionSettingsAndAppSettingsSyncTest.AppsStartWithSameSettings
TwoClientExtensionSettingsAndAppSettingsSyncTest.AppsStartWithDifferentSettings
TBR=dcheng@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10823037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_manager_impl.cc')
| -rw-r--r-- | sync/internal_api/sync_manager_impl.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc index 98ba4a3..547dae8 100644 --- a/sync/internal_api/sync_manager_impl.cc +++ b/sync/internal_api/sync_manager_impl.cc @@ -39,7 +39,6 @@ #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" #include "sync/js/js_reply_handler.h" -#include "sync/notifier/invalidation_util.h" #include "sync/notifier/notifications_disabled_reason.h" #include "sync/notifier/sync_notifier.h" #include "sync/protocol/encryption.pb.h" @@ -482,6 +481,8 @@ bool SyncManagerImpl::Init( if (!success) return false; + sync_notifier_->AddObserver(this); + return success; } @@ -724,8 +725,7 @@ void SyncManagerImpl::UpdateCredentials( void SyncManagerImpl::UpdateEnabledTypes( const ModelTypeSet& enabled_types) { DCHECK(thread_checker_.CalledOnValidThread()); - sync_notifier_->UpdateRegisteredIds(this, - ModelTypeSetToObjectIdSet(enabled_types)); + sync_notifier_->UpdateEnabledTypes(enabled_types); } void SyncManagerImpl::SetEncryptionPassphrase( @@ -1195,7 +1195,7 @@ void SyncManagerImpl::ShutdownOnSyncThread() { RemoveObserver(&debug_info_event_listener_); if (sync_notifier_.get()) { - sync_notifier_->UpdateRegisteredIds(this, ObjectIdSet()); + sync_notifier_->RemoveObserver(this); } sync_notifier_.reset(); @@ -1781,11 +1781,9 @@ void SyncManagerImpl::OnNotificationsDisabled( } void SyncManagerImpl::OnIncomingNotification( - const ObjectIdPayloadMap& id_payloads, + const ModelTypePayloadMap& type_payloads, IncomingNotificationSource source) { DCHECK(thread_checker_.CalledOnValidThread()); - const ModelTypePayloadMap& type_payloads = - ObjectIdPayloadMapToModelTypePayloadMap(id_payloads); if (source == LOCAL_NOTIFICATION) { scheduler_->ScheduleNudgeWithPayloadsAsync( TimeDelta::FromMilliseconds(kSyncRefreshDelayMsec), |