chrome/browser/profiles/profile_impl.cc - Issue 7218073: Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

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_impl.cc

Issue 7218073: Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/profiles/profile_impl.cc

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

index 4054c08d68ada0eaedd1580ab6ab16a048f35e84..c8ed4022d63b26ec7c70eb0183d1323532e84f05 100644

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

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

@@ -946,8 +946,10 @@ net::SSLConfigService* ProfileImpl::GetSSLConfigService() {

}

HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {

- if (!host_content_settings_map_.get())

- host_content_settings_map_ = new HostContentSettingsMap(this);

+ if (!host_content_settings_map_.get()) {

+ host_content_settings_map_ = new HostContentSettingsMap(

+ GetPrefs(), GetExtensionService(), false);

+ }

return host_content_settings_map_.get();

}

« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/test/testing_profile.cc » ('j') | no next file with comments »