chrome/browser/permissions/permission_queue_controller.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

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/permissions/permission_queue_controller.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict Created 5 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:

Index: chrome/browser/permissions/permission_queue_controller.cc

diff --git a/chrome/browser/permissions/permission_queue_controller.cc b/chrome/browser/permissions/permission_queue_controller.cc

index 0cc6d40dc1ef55f0ad47dde586b40e8537365cd1..9d4b0d1f4d940d6daf93177d7324dcb873ecc926 100644

--- a/chrome/browser/permissions/permission_queue_controller.cc

+++ b/chrome/browser/permissions/permission_queue_controller.cc

@@ -6,6 +6,7 @@

#include "base/prefs/pref_service.h"

#include "chrome/browser/chrome_notification_types.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/geolocation/geolocation_infobar_delegate.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/media/midi_permission_infobar_delegate.h"

@@ -397,7 +398,7 @@ void PermissionQueueController::UpdateContentSetting(

ContentSettingsPattern::Wildcard() :

ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());

- profile_->GetHostContentSettingsMap()->SetContentSetting(

+ HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(

ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),

embedder_pattern,

type_,