| Index: chrome/browser/sync/notifier/chrome_invalidation_client.h
|
| diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.h b/chrome/browser/sync/notifier/chrome_invalidation_client.h
|
| index a3b8ed820a41faeb0462ac10103ccfacb349fdba..921b8d884ffb5f9727a8f0a8b4b0c10dafc199ad 100644
|
| --- a/chrome/browser/sync/notifier/chrome_invalidation_client.h
|
| +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.h
|
| @@ -83,7 +83,7 @@ class ChromeInvalidationClient
|
|
|
| // Register the sync types that we're interested in getting
|
| // notifications for. May be called at any time.
|
| - void RegisterTypes(syncable::ModelEnumSet types);
|
| + void RegisterTypes(syncable::ModelTypeSet types);
|
|
|
| virtual void WriteState(const std::string& state) OVERRIDE;
|
|
|
| @@ -122,7 +122,7 @@ class ChromeInvalidationClient
|
| friend class ChromeInvalidationClientTest;
|
|
|
| void EmitInvalidation(
|
| - syncable::ModelEnumSet types, const std::string& payload);
|
| + syncable::ModelTypeSet types, const std::string& payload);
|
|
|
| base::NonThreadSafe non_thread_safe_;
|
| ChromeSystemResources chrome_system_resources_;
|
| @@ -138,7 +138,7 @@ class ChromeInvalidationClient
|
| cache_invalidation_packet_handler_;
|
| scoped_ptr<RegistrationManager> registration_manager_;
|
| // Stored to pass to |registration_manager_| on start.
|
| - syncable::ModelEnumSet registered_types_;
|
| + syncable::ModelTypeSet registered_types_;
|
| bool ticl_ready_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
|
|
|