| Index: chrome/browser/sync/syncable/syncable.h
|
| diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
|
| index c0d1928e20646d1f685488b369e2fc82551cfa48..3a1b3797e0713f3e733ecd73ce76314fa0f1e6c3 100644
|
| --- a/chrome/browser/sync/syncable/syncable.h
|
| +++ b/chrome/browser/sync/syncable/syncable.h
|
| @@ -31,7 +31,6 @@
|
| #include "chrome/browser/sync/syncable/syncable_id.h"
|
| #include "chrome/browser/sync/syncable/model_type.h"
|
| #include "chrome/browser/sync/util/dbgq.h"
|
| -#include "chrome/common/deprecated/event_sys.h"
|
|
|
| struct PurgeInfo;
|
|
|
| @@ -851,14 +850,7 @@ class Directory {
|
|
|
| template <class T> void TestAndSet(T* kernel_data, const T* data_to_set);
|
|
|
| - struct DirectoryEventTraits {
|
| - typedef DirectoryEvent EventType;
|
| - static inline bool IsChannelShutdownEvent(const DirectoryEvent& event) {
|
| - return DIRECTORY_DESTROYED == event;
|
| - }
|
| - };
|
| public:
|
| - typedef EventChannel<DirectoryEventTraits, base::Lock> Channel;
|
| typedef std::vector<int64> ChildHandles;
|
|
|
| // Returns the child meta handles for given parent id. Clears
|
| @@ -913,11 +905,6 @@ class Directory {
|
| void GetUnappliedUpdateMetaHandles(BaseTransaction* trans,
|
| UnappliedUpdateMetaHandles* result);
|
|
|
| - // Get the channel for post save notification, used by the syncer.
|
| - inline Channel* channel() const {
|
| - return kernel_->channel;
|
| - }
|
| -
|
| // Checks tree metadata consistency.
|
| // If full_scan is false, the function will avoid pulling any entries from the
|
| // db and scan entries currently in ram.
|
| @@ -1047,9 +1034,6 @@ class Directory {
|
| // them in here so that SaveChanges can persist their permanent deletion.
|
| MetahandleSet* const metahandles_to_purge;
|
|
|
| - // TODO(ncarter): Figure out what the hell this is, and comment it.
|
| - Channel* const channel;
|
| -
|
| KernelShareInfoStatus info_status;
|
|
|
| // These 3 members are backed in the share_info table, and
|
|
|