diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:52:44 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:52:44 +0000 |
| commit | ab44ef0ed3524ac26a5486d0e071c689f98d7087 (patch) | |
| tree | eb8f189e05e1d3087822785127399e5961fe4a3a /chrome/browser/sync/notifier | |
| parent | 3dec196bbf9945f96ab4a30802f238cda8518087 (diff) | |
| download | chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.zip chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.tar.gz chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.tar.bz2 | |
[Sync] Move TypePayloadMap into its own file
Also rename it to ModelTypePayloadMap.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/6718024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/notifier')
| -rw-r--r-- | chrome/browser/sync/notifier/invalidation_notifier.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/p2p_notifier.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/sync_notifier_observer.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sync/notifier/invalidation_notifier.cc b/chrome/browser/sync/notifier/invalidation_notifier.cc index 1e35781..0936e1e 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier.cc +++ b/chrome/browser/sync/notifier/invalidation_notifier.cc @@ -86,8 +86,8 @@ void InvalidationNotifier::OnIncomingNotification( model_types.set(); } - browser_sync::sessions::TypePayloadMap type_payloads = - browser_sync::sessions::MakeTypePayloadMapFromBitSet( + syncable::ModelTypePayloadMap type_payloads = + syncable::ModelTypePayloadMapFromBitSet( model_types, notification_payload); FOR_EACH_OBSERVER(SyncNotifierObserver, observer_list_, OnIncomingNotification(type_payloads)); diff --git a/chrome/browser/sync/notifier/p2p_notifier.cc b/chrome/browser/sync/notifier/p2p_notifier.cc index 12d031b..c0b8d7f 100644 --- a/chrome/browser/sync/notifier/p2p_notifier.cc +++ b/chrome/browser/sync/notifier/p2p_notifier.cc @@ -6,7 +6,7 @@ #include "chrome/browser/sync/notifier/sync_notifier_observer.h" #include "chrome/browser/sync/protocol/service_constants.h" -#include "chrome/browser/sync/sessions/session_state.h" +#include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "jingle/notifier/listener/mediator_thread_impl.h" #include "jingle/notifier/listener/talk_mediator_impl.h" @@ -113,8 +113,8 @@ void P2PNotifier::MaybeEmitNotification() { VLOG(1) << "No enabled types -- not emitting notification"; return; } - browser_sync::sessions::TypePayloadMap type_payloads = - browser_sync::sessions::MakeTypePayloadMapFromBitSet( + syncable::ModelTypePayloadMap type_payloads = + syncable::ModelTypePayloadMapFromBitSet( syncable::ModelTypeBitSetFromSet(enabled_types_), std::string()); FOR_EACH_OBSERVER(SyncNotifierObserver, observer_list_, OnIncomingNotification(type_payloads)); diff --git a/chrome/browser/sync/notifier/sync_notifier_observer.h b/chrome/browser/sync/notifier/sync_notifier_observer.h index 2978d17..79439ce 100644 --- a/chrome/browser/sync/notifier/sync_notifier_observer.h +++ b/chrome/browser/sync/notifier/sync_notifier_observer.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/sync/sessions/session_state.h" +#include "chrome/browser/sync/syncable/model_type_payload_map.h" namespace sync_notifier { @@ -18,7 +18,7 @@ class SyncNotifierObserver { virtual ~SyncNotifierObserver() {} virtual void OnIncomingNotification( - const browser_sync::sessions::TypePayloadMap& type_payloads) = 0; + const syncable::ModelTypePayloadMap& type_payloads) = 0; virtual void OnNotificationStateChange(bool notifications_enabled) = 0; // TODO(nileshagrawal): Find a way to hide state handling inside the |