chrome/browser/profiles/profile_manager.cc - Issue 545413002: Detach the dependency from host_content_settings_map to extension.

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 545413002: Detach the dependency from host_content_settings_map to extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 years, 3 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/host_content_settings_map.h ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
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 982d0100d93b7090370bf487365f11b48023163d..b9db5d329a3cc70cc9d198a2ffc426acaf88956e 100644

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

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

@@ -984,8 +984,8 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,

// During tests, when |profile| is an instance of TestingProfile,

// ExtensionSystem might not create an ExtensionService.

if (extensions::ExtensionSystem::Get(profile)->extension_service()) {

- profile->GetHostContentSettingsMap()->RegisterExtensionService(

- extensions::ExtensionSystem::Get(profile)->extension_service());

+ extensions::ExtensionSystem::Get(profile)->extension_service()->

+ RegisterContentSettings(profile->GetHostContentSettingsMap());

}

#endif

#if defined(ENABLE_MANAGED_USERS) && !defined(OS_ANDROID)