summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_manager_impl.h
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 00:06:15 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 00:06:15 +0000
commit43ee82166efe4fea87bb186c629a35b3a8995fe2 (patch)
tree4aaefc82b73c3e0b4af7b8fc536476afed5a6ec5 /sync/internal_api/sync_manager_impl.h
parent2238037ce16a1f6e736001813b6a05c87fe0f7a9 (diff)
downloadchromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.zip
chromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.tar.gz
chromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.tar.bz2
Add non-blocking sync code to ProfileSyncService
Adds support for non-blocking sync to the ProfileSyncService and related classes. This continues the work of r258390 and r259921. Like those patches, it is not expected to have any impact on behavior. Introduces ProfileSyncService::RegisterNonBlockingType(). This function will act as an alternative to RegisterDataTypeController(). Adds some support for these non-blocking types. Adds a special case to the code that generates the 'type status' table on the about:sync page. Instantiates and copies a SyncCoreProxy object to the ProfileSyncService as backend initialization completes. This will be an important part of non-blocking data type initialization, once that functionality is supported. BUG=351005 Review URL: https://codereview.chromium.org/217183003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_manager_impl.h')
-rw-r--r--sync/internal_api/sync_manager_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index c8f9aed..7386e01 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -110,7 +110,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl :
virtual void SaveChanges() OVERRIDE;
virtual void ShutdownOnSyncThread() OVERRIDE;
virtual UserShare* GetUserShare() OVERRIDE;
- virtual syncer::SyncCore* GetSyncCore() OVERRIDE;
+ virtual base::WeakPtr<syncer::SyncCore> GetSyncCore() OVERRIDE;
virtual const std::string cache_guid() OVERRIDE;
virtual bool ReceivedExperiment(Experiments* experiments) OVERRIDE;
virtual bool HasUnsyncedItems() OVERRIDE;