sync/internal_api/sync_manager_impl.h - Issue 1848793006: [Sync] Register USS types with ModelTypeRegistry before download

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/sync_manager_impl.h

Issue 1848793006: [Sync] Register USS types with ModelTypeRegistry before download (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments from Sky and Max. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« sync/internal_api/public/engine/model_safe_worker.h ('K') | « sync/internal_api/public/engine/model_safe_worker_unittest.cc ('k') | sync/sessions/model_type_registry.cc » ('j') | sync/sessions/model_type_registry_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/sync_manager_impl.h

diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h

index 5efc905a333f84118fb48ba5bcecb8901c18ccf4..6c4e6a345402d084982414fa9b2abb7e3c1e68e9 100644

--- a/sync/internal_api/sync_manager_impl.h

+++ b/sync/internal_api/sync_manager_impl.h

@@ -294,8 +294,7 @@ class SYNC_EXPORT SyncManagerImpl

// This state changes when entering or exiting a configuration cycle.

scoped_ptr<ModelTypeRegistry> model_type_registry_;

- // The main interface for non-blocking sync types and a thread-safe wrapper.

- scoped_ptr<syncer_v2::SyncContext> sync_context_;

+ // Thread-safe wrapper for main interface for non-blocking sync types.

scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_;

// A container of various bits of information used by the SyncScheduler to