chrome/browser/content_settings/host_content_settings_map_factory.cc - Issue 1605453003: Ensure content settings aren't persisted in the guest 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/content_settings/host_content_settings_map_factory.cc

Issue 1605453003: Ensure content settings aren't persisted in the guest profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider_unittest.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map_factory.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc

index 386c277d856600892a7069382f06bedbdd97bc98..c95b10490d63be38b504458fe240ea563043c7b9 100644

--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc

+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc

@@ -61,15 +61,16 @@ scoped_refptr<RefcountedKeyedService>

DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

Profile* profile = static_cast<Profile*>(context);

- bool off_the_record = profile->GetProfileType() == Profile::INCOGNITO_PROFILE;

// If off the record, retrieve the host content settings map of the parent

// profile in order to ensure the preferences have been migrated.

- if (off_the_record)

+ if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE)

GetForProfile(profile->GetOriginalProfile());

- scoped_refptr<HostContentSettingsMap> settings_map(

- new HostContentSettingsMap(profile->GetPrefs(), off_the_record));

+ scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(

+ profile->GetPrefs(),

+ profile->GetProfileType() == Profile::INCOGNITO_PROFILE,

+ profile->GetProfileType() == Profile::GUEST_PROFILE));

#if defined(ENABLE_EXTENSIONS)

ExtensionService *ext_service =