chrome/browser/profiles/profile_manager.cc - Issue 902833003: Add a HostContentSettingsMap layer for Supervised Users.

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 902833003: Add a HostContentSettingsMap layer for Supervised Users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments. Created 5 years, 10 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

« chrome/browser/content_settings/content_settings_supervised_provider.cc ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/supervised_user/supervised_user_constants.h » ('j') | chrome/browser/supervised_user/supervised_user_constants.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

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

index b524dc385c337a064bfc5e98f55168bb9db6161e..794fa60f210bf6a5ca5333f47671ab1e423fe716 100644

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

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

@@ -79,6 +79,8 @@

#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"

+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"

+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"

#endif

#if !defined(OS_IOS)

@@ -1045,6 +1047,10 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,

// initializing the supervised flag if necessary).

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

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

+ SupervisedUserSettingsService* supervised_service =

+ SupervisedUserSettingsServiceFactory::GetForProfile(profile);

+ supervised_service->RegisterContentSettings(

+ profile->GetHostContentSettingsMap());

#endif

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

StartupTaskRunnerServiceFactory::GetForProfile(profile)->