| Index: chrome/browser/sync/notifier/p2p_notifier.h
|
| diff --git a/chrome/browser/sync/notifier/p2p_notifier.h b/chrome/browser/sync/notifier/p2p_notifier.h
|
| index 6a8a376514203bad0b378df590851340ffe17db3..6ff00533b9b125a3a9091536902707e53e858077 100644
|
| --- a/chrome/browser/sync/notifier/p2p_notifier.h
|
| +++ b/chrome/browser/sync/notifier/p2p_notifier.h
|
| @@ -53,14 +53,14 @@ class P2PNotificationData {
|
| P2PNotificationData();
|
| P2PNotificationData(const std::string& sender_id,
|
| P2PNotificationTarget target,
|
| - syncable::ModelEnumSet changed_types);
|
| + syncable::ModelTypeSet changed_types);
|
|
|
| ~P2PNotificationData();
|
|
|
| // Returns true if the given ID is targeted by this notification.
|
| bool IsTargeted(const std::string& id) const;
|
|
|
| - syncable::ModelEnumSet GetChangedTypes() const;
|
| + syncable::ModelTypeSet GetChangedTypes() const;
|
|
|
| bool Equals(const P2PNotificationData& other) const;
|
|
|
| @@ -76,7 +76,7 @@ class P2PNotificationData {
|
| // The intendent recipient(s) of the notification.
|
| P2PNotificationTarget target_;
|
| // The types the notification is for.
|
| - syncable::ModelEnumSet changed_types_;
|
| + syncable::ModelTypeSet changed_types_;
|
| };
|
|
|
| class P2PNotifier
|
| @@ -104,9 +104,9 @@ class P2PNotifier
|
| virtual void UpdateCredentials(
|
| const std::string& email, const std::string& token) OVERRIDE;
|
| virtual void UpdateEnabledTypes(
|
| - syncable::ModelEnumSet enabled_types) OVERRIDE;
|
| + syncable::ModelTypeSet enabled_types) OVERRIDE;
|
| virtual void SendNotification(
|
| - syncable::ModelEnumSet changed_types) OVERRIDE;
|
| + syncable::ModelTypeSet changed_types) OVERRIDE;
|
|
|
| // TalkMediator::Delegate implementation.
|
| virtual void OnNotificationStateChange(bool notifications_enabled) OVERRIDE;
|
| @@ -135,7 +135,7 @@ class P2PNotifier
|
| // Which set of clients should be sent notifications.
|
| P2PNotificationTarget send_notification_target_;
|
|
|
| - syncable::ModelEnumSet enabled_types_;
|
| + syncable::ModelTypeSet enabled_types_;
|
| scoped_refptr<base::MessageLoopProxy> parent_message_loop_proxy_;
|
| };
|
|
|
|
|