chrome/browser/profiles/profile_manager.cc - Issue 783083002: Add support for child accounts.

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 783083002: Add support for child accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove CrOS for now Created 6 years 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 a026bfd6aded35c27abb237a7e911c2845802db0..4a94d805dff2ad2712a170bdb35351a9d0b39e8e 100644

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

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

@@ -74,6 +74,8 @@

#endif

#if defined(ENABLE_SUPERVISED_USERS)

+#include "chrome/browser/supervised_user/child_accounts/child_account_service.h"

+#include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"

#include "chrome/browser/supervised_user/supervised_user_service.h"

#include "chrome/browser/supervised_user/supervised_user_service_factory.h"

#endif

@@ -1019,6 +1021,7 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,

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

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

// initializing the supervised flag if necessary).

+ ChildAccountServiceFactory::GetForProfile(profile)->Init();

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

#endif

// Start the deferred task runners once the profile is loaded.