| Index: sync/syncable/directory.h
|
| diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
|
| index 42475305c2952ee7608194050e7e0c5e301e8cb7..681083a2c67b0a76a3011d9f6f2ae37d571b1153 100644
|
| --- a/sync/syncable/directory.h
|
| +++ b/sync/syncable/directory.h
|
| @@ -168,8 +168,6 @@ class Directory {
|
| // TODO(hatiaol): implement detection and fixing of out-of-sync models.
|
| // Bug 154858.
|
| int64 transaction_version[MODEL_TYPE_COUNT];
|
| - // true iff we ever reached the end of the changelog.
|
| - ModelTypeSet initial_sync_ended;
|
| // The store birthday we were given by the server. Contents are opaque to
|
| // the client.
|
| std::string store_birthday;
|
| @@ -264,9 +262,9 @@ class Directory {
|
| int64 GetTransactionVersion(ModelType type) const;
|
| void IncrementTransactionVersion(ModelType type);
|
|
|
| - ModelTypeSet initial_sync_ended_types() const;
|
| - bool initial_sync_ended_for_type(ModelType type) const;
|
| - void set_initial_sync_ended_for_type(ModelType type, bool value);
|
| + ModelTypeSet InitialSyncEndedTypes();
|
| + bool InitialSyncEndedForType(ModelType type);
|
| + bool InitialSyncEndedForType(BaseTransaction* trans, ModelType type);
|
|
|
| const std::string& name() const { return kernel_->name; }
|
|
|
| @@ -490,7 +488,6 @@ class Directory {
|
| // Internal setters that do not acquire a lock internally. These are unsafe
|
| // on their own; caller must guarantee exclusive access manually by holding
|
| // a ScopedKernelLock.
|
| - void set_initial_sync_ended_for_type_unsafe(ModelType type, bool x);
|
| void SetNotificationStateUnsafe(const std::string& notification_state);
|
|
|
| Directory& operator = (const Directory&);
|
|
|