diff options
| author | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-16 01:36:54 +0000 |
|---|---|---|
| committer | chron@google.com <chron@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-16 01:36:54 +0000 |
| commit | adcf48d837091816175e4f22224fd615781fa899 (patch) | |
| tree | 65b74eca87fb5cabff022bc596968f7cdf0fcd45 /chrome/browser/sync/engine/syncproto.h | |
| parent | fa08ac4a4f068b054a2048d53c5b2c4b4431eb5b (diff) | |
| download | chromium_src-adcf48d837091816175e4f22224fd615781fa899.zip chromium_src-adcf48d837091816175e4f22224fd615781fa899.tar.gz chromium_src-adcf48d837091816175e4f22224fd615781fa899.tar.bz2 | |
Merge protocol buffer changes from server back into client.
Use new style protocol in addition to old style protocol when talking to the server in preparation for new data type synchronization.
original patch from issue 487011
TEST=manually tested old client new client new server mixes
BUG=30032
Review URL: http://codereview.chromium.org/549029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncproto.h')
| -rw-r--r-- | chrome/browser/sync/engine/syncproto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncproto.h b/chrome/browser/sync/engine/syncproto.h index 25901dc..cbe56a1 100644 --- a/chrome/browser/sync/engine/syncproto.h +++ b/chrome/browser/sync/engine/syncproto.h @@ -46,7 +46,8 @@ class SyncEntity : public IdWrapper<sync_pb::SyncEntity> { // directly, because the addition of bookmarks to the protobuf schema // makes the check slightly more tricky. bool IsFolder() const { - return (!has_bookmarkdata() || bookmarkdata().bookmark_folder()); + return ((has_folder() && folder()) || + (has_bookmarkdata() && bookmarkdata().bookmark_folder())); } }; |