trunk/src/chrome/browser/sync/profile_sync_service_factory.cc - Issue 15968002: Revert 201837 "OOP import on Windows."

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: trunk/src/chrome/browser/sync/profile_sync_service_factory.cc

Issue 15968002: Revert 201837 "OOP import on Windows." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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:

Index: trunk/src/chrome/browser/sync/profile_sync_service_factory.cc

===================================================================

--- trunk/src/chrome/browser/sync/profile_sync_service_factory.cc (revision 201967)

+++ trunk/src/chrome/browser/sync/profile_sync_service_factory.cc (working copy)

@@ -39,6 +39,10 @@

if (!ProfileSyncService::IsSyncEnabled())

return NULL;

+ // Do not start sync on the import process.

+ if (ProfileManager::IsImportProcess(*CommandLine::ForCurrentProcess()))

+ return NULL;

return static_cast<ProfileSyncService*>(

GetInstance()->GetServiceForBrowserContext(profile, true));

}