| Index: components/sync/core/base_node.h
|
| diff --git a/sync/internal_api/public/base_node.h b/components/sync/core/base_node.h
|
| similarity index 94%
|
| rename from sync/internal_api/public/base_node.h
|
| rename to components/sync/core/base_node.h
|
| index a439c65cae91bfd1ab7388a0ebf162cda81130db..93394c104978905dbaee76bf3972f9c77b506c99 100644
|
| --- a/sync/internal_api/public/base_node.h
|
| +++ b/components/sync/core/base_node.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_INTERNAL_API_PUBLIC_BASE_NODE_H_
|
| -#define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_
|
| +#ifndef COMPONENTS_SYNC_CORE_BASE_NODE_H_
|
| +#define COMPONENTS_SYNC_CORE_BASE_NODE_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -15,10 +15,10 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| -#include "sync/api/attachments/attachment.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| +#include "components/sync/api/attachments/attachment.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| #include "url/gurl.h"
|
|
|
| // Forward declarations of internal class types so that sync API objects
|
| @@ -84,9 +84,8 @@ class SYNC_EXPORT BaseNode {
|
| // All subclasses of BaseNode must also provide a way to initialize themselves
|
| // by doing a client tag lookup. Returns false on failure. A deleted node
|
| // will return FALSE.
|
| - virtual InitByLookupResult InitByClientTagLookup(
|
| - ModelType model_type,
|
| - const std::string& tag) = 0;
|
| + virtual InitByLookupResult InitByClientTagLookup(ModelType model_type,
|
| + const std::string& tag) = 0;
|
|
|
| // Each object is identified by a 64-bit id (internally, the syncable
|
| // metahandle). These ids are strictly local handles. They will persist
|
| @@ -242,4 +241,4 @@ class SYNC_EXPORT BaseNode {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_
|
| +#endif // COMPONENTS_SYNC_CORE_BASE_NODE_H_
|
|
|