diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:04:46 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:04:46 +0000 |
| commit | bd21a961f6937f7548401bbaae78e0543a982aea (patch) | |
| tree | d8c83884f36c20e437a586d4f071aa5399673748 /chrome/browser/sync/internal_api | |
| parent | 9a9535ef01fbb4e9e671573dee90f5c2a6906ea8 (diff) | |
| download | chromium_src-bd21a961f6937f7548401bbaae78e0543a982aea.zip chromium_src-bd21a961f6937f7548401bbaae78e0543a982aea.tar.gz chromium_src-bd21a961f6937f7548401bbaae78e0543a982aea.tar.bz2 | |
Revert 105176 - [Sync] Disable sync tabs automation.
BUG=94693
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/8194014
TBR=zea@chromium.org
Review URL: http://codereview.chromium.org/8278003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/internal_api')
| -rw-r--r-- | chrome/browser/sync/internal_api/sync_manager.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc index a0611b0..0bef79a 100644 --- a/chrome/browser/sync/internal_api/sync_manager.cc +++ b/chrome/browser/sync/internal_api/sync_manager.cc @@ -2005,6 +2005,16 @@ syncable::ModelTypeSet SyncManager::GetEncryptedDataTypes() const { bool SyncManager::ReceivedExperimentalTypes(syncable::ModelTypeSet* to_add) const { + ReadTransaction trans(FROM_HERE, GetUserShare()); + ReadNode node(&trans); + if (!node.InitByTagLookup(kNigoriTag)) { + VLOG(1) << "Couldn't find Nigori node."; + return false; + } + if (node.GetNigoriSpecifics().sync_tabs()) { + to_add->insert(syncable::SESSIONS); + return true; + } return false; } |