| Index: components/sync/syncable/mutable_entry.h
|
| diff --git a/sync/syncable/mutable_entry.h b/components/sync/syncable/mutable_entry.h
|
| similarity index 83%
|
| rename from sync/syncable/mutable_entry.h
|
| rename to components/sync/syncable/mutable_entry.h
|
| index 8cc5df74fff736b07e7f6acad7521d667489444c..ce25a293ee825f4cb9c00b0c7c1b602dfff733d8 100644
|
| --- a/sync/syncable/mutable_entry.h
|
| +++ b/components/sync/syncable/mutable_entry.h
|
| @@ -2,36 +2,36 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
| -#define SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
| +#ifndef COMPONENTS_SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
| +#define COMPONENTS_SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/syncable/entry.h"
|
| -#include "sync/syncable/metahandle_set.h"
|
| -#include "sync/syncable/model_neutral_mutable_entry.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/syncable/entry.h"
|
| +#include "components/sync/syncable/metahandle_set.h"
|
| +#include "components/sync/syncable/model_neutral_mutable_entry.h"
|
|
|
| namespace syncer {
|
| class WriteNode;
|
|
|
| namespace syncable {
|
|
|
| -enum Create {
|
| - CREATE
|
| -};
|
| +enum Create { CREATE };
|
|
|
| class WriteTransaction;
|
|
|
| // A mutable meta entry. Changes get committed to the database when the
|
| // WriteTransaction is destroyed.
|
| class SYNC_EXPORT MutableEntry : public ModelNeutralMutableEntry {
|
| - void Init(WriteTransaction* trans, ModelType model_type,
|
| - const Id& parent_id, const std::string& name);
|
| + void Init(WriteTransaction* trans,
|
| + ModelType model_type,
|
| + const Id& parent_id,
|
| + const std::string& name);
|
|
|
| public:
|
| MutableEntry(WriteTransaction* trans, CreateNewUpdateItem, const Id& id);
|
| @@ -93,4 +93,4 @@ bool MarkForSyncing(syncable::MutableEntry* e);
|
| } // namespace syncable
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
| +#endif // COMPONENTS_SYNC_SYNCABLE_MUTABLE_ENTRY_H_
|
|
|