| Index: sync/internal_api/public/base_node.h
|
| diff --git a/sync/internal_api/public/base_node.h b/sync/internal_api/public/base_node.h
|
| index 7112d7314a25bf586fde3b3f862fb602d99ebd58..7212927f822215c090e0f9c357efa7c5f70bd3cb 100644
|
| --- a/sync/internal_api/public/base_node.h
|
| +++ b/sync/internal_api/public/base_node.h
|
| @@ -79,7 +79,7 @@ class BaseNode {
|
| // by doing a client tag lookup. Returns false on failure. A deleted node
|
| // will return FALSE.
|
| virtual InitByLookupResult InitByClientTagLookup(
|
| - syncable::ModelType model_type,
|
| + syncer::ModelType model_type,
|
| const std::string& tag) = 0;
|
|
|
| // Each object is identified by a 64-bit id (internally, the syncable
|
| @@ -107,7 +107,7 @@ class BaseNode {
|
|
|
| // Returns the model type of this object. The model type is set at node
|
| // creation time and is expected never to change.
|
| - syncable::ModelType GetModelType() const;
|
| + syncer::ModelType GetModelType() const;
|
|
|
| // Getter specific to the BOOKMARK datatype. Returns protobuf
|
| // data. Can only be called if GetModelType() == BOOKMARK.
|
| @@ -203,7 +203,7 @@ class BaseNode {
|
| virtual ~BaseNode();
|
| // The server has a size limit on client tags, so we generate a fixed length
|
| // hash locally. This also ensures that ModelTypes have unique namespaces.
|
| - static std::string GenerateSyncableHash(syncable::ModelType model_type,
|
| + static std::string GenerateSyncableHash(syncer::ModelType model_type,
|
| const std::string& client_tag);
|
|
|
| // Determines whether part of the entry is encrypted, and if so attempts to
|
|
|