diff options
author | stanisc <stanisc@chromium.org> | 2015-08-05 00:21:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 07:25:25 +0000 |
commit | a23b61eff1d3a2908a2e272c0d8ce89417168676 (patch) | |
tree | afdaf29280e664143e9f8b3dbcf178351f53f213 /sync/internal_api/sync_manager_impl.cc | |
parent | bd82a94bbc1738c60459dec25f4d9aa73f7baeab (diff) | |
download | chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.zip chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.tar.gz chromium_src-a23b61eff1d3a2908a2e272c0d8ce89417168676.tar.bz2 |
Sync: move v2 classes in chrome/internal_api to syncer_v2 namespace.
This changes namespace of some of internal API Bismarck classes from
syncer to syncer_v2 to make it easier to distinguish the new code from the
current Sync implementation. The change includes a bit of dependency
cleanup. This is a fairly trivial change, but a good way to see most of
Bismarck classes and how they are integrated in the rest of the code.
There are two more separate issues to make a similar namespace change
in sync/engine and components/sync_driver directories.
sync/engine
BUG=516414
Review URL: https://codereview.chromium.org/1266113004
Cr-Commit-Position: refs/heads/master@{#341862}
Diffstat (limited to 'sync/internal_api/sync_manager_impl.cc')
-rw-r--r-- | sync/internal_api/sync_manager_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc index 67dd78f..15d2d85 100644 --- a/sync/internal_api/sync_manager_impl.cc +++ b/sync/internal_api/sync_manager_impl.cc @@ -313,11 +313,12 @@ void SyncManagerImpl::Init(InitArgs* args) { // Bind the SyncContext WeakPtr to this thread. This helps us crash earlier // if the pointer is misused in debug mode. - base::WeakPtr<SyncContext> weak_core = model_type_registry_->AsWeakPtr(); + base::WeakPtr<syncer_v2::SyncContext> weak_core = + model_type_registry_->AsWeakPtr(); weak_core.get(); - sync_context_proxy_.reset( - new SyncContextProxyImpl(base::ThreadTaskRunnerHandle::Get(), weak_core)); + sync_context_proxy_.reset(new syncer_v2::SyncContextProxyImpl( + base::ThreadTaskRunnerHandle::Get(), weak_core)); // Build a SyncSessionContext and store the worker in it. DVLOG(1) << "Sync is bringing up SyncSessionContext."; @@ -940,7 +941,7 @@ UserShare* SyncManagerImpl::GetUserShare() { return &share_; } -syncer::SyncContextProxy* SyncManagerImpl::GetSyncContextProxy() { +syncer_v2::SyncContextProxy* SyncManagerImpl::GetSyncContextProxy() { DCHECK(initialized_); return sync_context_proxy_.get(); } |