| Index: components/sync/syncable/entry.h
|
| diff --git a/sync/syncable/entry.h b/components/sync/syncable/entry.h
|
| similarity index 92%
|
| rename from sync/syncable/entry.h
|
| rename to components/sync/syncable/entry.h
|
| index 906387f0881aede028485dc90febfe5e50af6d26..367cde52a4e4fac3e7ccf50137a4b75f61162595 100644
|
| --- a/sync/syncable/entry.h
|
| +++ b/components/sync/syncable/entry.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_SYNCABLE_ENTRY_H_
|
| -#define SYNC_SYNCABLE_ENTRY_H_
|
| +#ifndef COMPONENTS_SYNC_SYNCABLE_ENTRY_H_
|
| +#define COMPONENTS_SYNC_SYNCABLE_ENTRY_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -12,8 +12,8 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/syncable/entry_kernel.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/syncable/entry_kernel.h"
|
|
|
| namespace syncer {
|
| class Cryptographer;
|
| @@ -33,26 +33,18 @@ class BaseTransaction;
|
| // Why? The former would require a copy constructor, and it would be difficult
|
| // to enforce that an entry never outlived its transaction if there were a copy
|
| // constructor.
|
| -enum GetById {
|
| - GET_BY_ID
|
| -};
|
| +enum GetById { GET_BY_ID };
|
|
|
| -enum GetByClientTag {
|
| - GET_BY_CLIENT_TAG
|
| -};
|
| +enum GetByClientTag { GET_BY_CLIENT_TAG };
|
|
|
| enum GetByServerTag {
|
| // Server tagged items are deprecated for all types but bookmarks.
|
| GET_BY_SERVER_TAG
|
| };
|
|
|
| -enum GetTypeRoot {
|
| - GET_TYPE_ROOT
|
| -};
|
| +enum GetTypeRoot { GET_TYPE_ROOT };
|
|
|
| -enum GetByHandle {
|
| - GET_BY_HANDLE
|
| -};
|
| +enum GetByHandle { GET_BY_HANDLE };
|
|
|
| class SYNC_EXPORT Entry {
|
| public:
|
| @@ -261,9 +253,7 @@ class SYNC_EXPORT Entry {
|
|
|
| Directory* dir() const;
|
|
|
| - const EntryKernel GetKernelCopy() const {
|
| - return *kernel_;
|
| - }
|
| + const EntryKernel GetKernelCopy() const { return *kernel_; }
|
|
|
| // Dumps all entry info into a DictionaryValue and returns it.
|
| // Transfers ownership of the DictionaryValue to the caller.
|
| @@ -273,8 +263,7 @@ class SYNC_EXPORT Entry {
|
| void* operator new(size_t size) { return (::operator new)(size); }
|
|
|
| inline explicit Entry(BaseTransaction* trans)
|
| - : basetrans_(trans),
|
| - kernel_(NULL) { }
|
| + : basetrans_(trans), kernel_(NULL) {}
|
|
|
| protected:
|
| BaseTransaction* const basetrans_;
|
| @@ -284,7 +273,7 @@ class SYNC_EXPORT Entry {
|
| private:
|
| friend class Directory;
|
| friend class syncer::ReadNode;
|
| - friend std::ostream& operator << (std::ostream& s, const Entry& e);
|
| + friend std::ostream& operator<<(std::ostream& s, const Entry& e);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Entry);
|
| };
|
| @@ -294,4 +283,4 @@ std::ostream& operator<<(std::ostream& os, const Entry& entry);
|
| } // namespace syncable
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SYNCABLE_ENTRY_H_
|
| +#endif // COMPONENTS_SYNC_SYNCABLE_ENTRY_H_
|
|
|