| Index: sync/syncable/directory.h
|
| diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
|
| index 9d66b81f15c14cafb01d21d37879db3c62c56b84..e7c59a0dd3a18885fdd8933a031f27e167cfb34c 100644
|
| --- a/sync/syncable/directory.h
|
| +++ b/sync/syncable/directory.h
|
| @@ -302,9 +302,6 @@ class SYNC_EXPORT Directory {
|
|
|
| ModelTypeSet InitialSyncEndedTypes();
|
| bool InitialSyncEndedForType(ModelType type);
|
| - bool InitialSyncEndedForType(BaseTransaction* trans, ModelType type);
|
| -
|
| - const std::string& name() const { return kernel_->name; }
|
|
|
| // (Account) Store birthday is opaque to the client, so we keep it in the
|
| // format it is in the proto buffer in case we switch to a binary birthday
|
| @@ -327,12 +324,6 @@ class SYNC_EXPORT Directory {
|
| // Not thread safe, so should only be accessed while holding a transaction.
|
| Cryptographer* GetCryptographer(const BaseTransaction* trans);
|
|
|
| - // Returns true if the directory had encountered an unrecoverable error.
|
| - // Note: Any function in |Directory| that can be called without holding a
|
| - // transaction need to check if the Directory already has an unrecoverable
|
| - // error on it.
|
| - bool unrecoverable_error_set(const BaseTransaction* trans) const;
|
| -
|
| // Called to immediately report an unrecoverable error (but don't
|
| // propagate it up).
|
| void ReportUnrecoverableError() {
|
| @@ -628,10 +619,19 @@ class SYNC_EXPORT Directory {
|
| ModelType type,
|
| std::vector<int64>* result);
|
|
|
| + // Returns true if the initial sync for |type| has completed.
|
| + bool InitialSyncEndedForType(BaseTransaction* trans, ModelType type);
|
| +
|
| // Stops sending events to the delegate and the transaction
|
| // observer.
|
| void Close();
|
|
|
| + // Returns true if the directory had encountered an unrecoverable error.
|
| + // Note: Any function in |Directory| that can be called without holding a
|
| + // transaction need to check if the Directory already has an unrecoverable
|
| + // error on it.
|
| + bool unrecoverable_error_set(const BaseTransaction* trans) const;
|
| +
|
| Kernel* kernel_;
|
|
|
| scoped_ptr<DirectoryBackingStore> store_;
|
|
|