summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/syncproto.h
diff options
context:
space:
mode:
authoralbertb@google.com <albertb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 20:00:51 +0000
committeralbertb@google.com <albertb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 20:00:51 +0000
commitfc5062475b953d2e96dc0ba89a922893e382ef5a (patch)
tree03f78007ab30bfaa5b497b89987d1a808ed01709 /chrome/browser/sync/engine/syncproto.h
parentb0c8acf8a8b6f435510323c0c0435053301d1eed (diff)
downloadchromium_src-fc5062475b953d2e96dc0ba89a922893e382ef5a.zip
chromium_src-fc5062475b953d2e96dc0ba89a922893e382ef5a.tar.gz
chromium_src-fc5062475b953d2e96dc0ba89a922893e382ef5a.tar.bz2
Sync api changes to support preferences.
BUG=34174 TEST=none Review URL: http://codereview.chromium.org/561010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncproto.h')
-rw-r--r--chrome/browser/sync/engine/syncproto.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/syncproto.h b/chrome/browser/sync/engine/syncproto.h
index 1d5f428..ba087df 100644
--- a/chrome/browser/sync/engine/syncproto.h
+++ b/chrome/browser/sync/engine/syncproto.h
@@ -8,6 +8,7 @@
#define CHROME_BROWSER_SYNC_ENGINE_SYNCPROTO_H_
#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
+#include "chrome/browser/sync/protocol/preference_specifics.pb.h"
#include "chrome/browser/sync/protocol/sync.pb.h"
#include "chrome/browser/sync/syncable/model_type.h"
#include "chrome/browser/sync/syncable/syncable_id.h"
@@ -62,6 +63,9 @@ class SyncEntity : public IdWrapper<sync_pb::SyncEntity> {
if (specifics().HasExtension(sync_pb::bookmark) || has_bookmarkdata())
return syncable::BOOKMARKS;
+ if (specifics().HasExtension(sync_pb::preference))
+ return syncable::PREFERENCES;
+
// Loose check for server-created top-level folders that aren't
// bound to a particular model type.
if (!singleton_tag().empty() && IsFolder())