summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/syncproto.h
diff options
context:
space:
mode:
authorchron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 22:00:06 +0000
committerchron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 22:00:06 +0000
commit7377db59c9a1b6d5b3724acee85fb5171ddc37a4 (patch)
tree5b8b14e1a16be3e1db553a6dff96c4ee6689eecc /chrome/browser/sync/engine/syncproto.h
parent0cf9160a53a0dbd523656858a36e3bbeeac76b25 (diff)
downloadchromium_src-7377db59c9a1b6d5b3724acee85fb5171ddc37a4.zip
chromium_src-7377db59c9a1b6d5b3724acee85fb5171ddc37a4.tar.gz
chromium_src-7377db59c9a1b6d5b3724acee85fb5171ddc37a4.tar.bz2
Added UNIQUE_CLIENT_TAG to sync engine. Added some syncapi unit tests. Added new index to syncable. Added new DB col to syncable. Renamed singleton tag to UNIQUE_CLIENT_TAG. Added syncapi layer support for unique client tags.
Hooked up wire protocol to use this index. Downintegrate of sync.proto from trunk. TEST=unit tests included BUG=32636 Review URL: http://codereview.chromium.org/558015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncproto.h')
-rw-r--r--chrome/browser/sync/engine/syncproto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncproto.h b/chrome/browser/sync/engine/syncproto.h
index ba087df..c34a709 100644
--- a/chrome/browser/sync/engine/syncproto.h
+++ b/chrome/browser/sync/engine/syncproto.h
@@ -68,7 +68,7 @@ class SyncEntity : public IdWrapper<sync_pb::SyncEntity> {
// Loose check for server-created top-level folders that aren't
// bound to a particular model type.
- if (!singleton_tag().empty() && IsFolder())
+ if (!server_defined_unique_tag().empty() && IsFolder())
return syncable::TOP_LEVEL_FOLDER;
// This is an item of a datatype we can't understand. Maybe it's