chrome/browser/profiles/profile_manager.cc - Issue 12330073: Disable ProfileKeyedServices on import process by default.

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: chrome/browser/profiles/profile_manager.cc

Issue 12330073: Disable ProfileKeyedServices on import process by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to ToT Created 7 years, 9 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: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 4918f03250864b955ace95b13d29d57dd38d4cb3..2cec89a733fb34c4624820ae5b6b34933633d3cd 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -755,7 +755,10 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,

// Initialization needs to happen after extension system initialization (for

// extension::ManagementPolicy) and InitProfileUserPrefs (for setting the

// initializing the managed flag if necessary).

- ManagedUserServiceFactory::GetForProfile(profile)->Init();

+ ManagedUserService* managed_user_service =

+ ManagedUserServiceFactory::GetForProfile(profile);

+ if (managed_user_service)

+ managed_user_service->Init();

#endif

}