chrome/browser/profiles/profile_impl.cc - Issue 596613002: Remove content dependencies from content settings providers.

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 596613002: Remove content dependencies from content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: browser_tests 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/profiles/off_the_record_profile_impl.cc ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | components/content_settings/core/browser/content_settings_observable_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

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

index 4229b4f1eb4ee1720d547e07944e77959276b0e0..a0ee111fcca198419a5e99f98cb155dbdfb42c41 100644

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

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

@@ -1123,6 +1123,7 @@ net::SSLConfigService* ProfileImpl::GetSSLConfigService() {

HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {

if (!host_content_settings_map_.get()) {

+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

rpetterson 2014/09/26 03:46:34 same question as above

host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);

}

return host_content_settings_map_.get();