chrome/browser/renderer_host/pepper/pepper_broker_message_filter.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/renderer_host/pepper/pepper_broker_message_filter.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc ('k') | chrome/browser/signin/chrome_signin_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc

diff --git a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc

index 0febc0459f5ea5f9be7d87813c920fe0d0b0a010..a8d926f9d2eefed7a35b8c38ad0eff9ac92a0b34 100644

--- a/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc

+++ b/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc

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

#include <string>

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

#include "chrome/browser/profiles/profile.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/content_settings/core/common/content_settings.h"

@@ -61,7 +62,7 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(

Profile* profile =

Profile::FromBrowserContext(render_process_host->GetBrowserContext());

HostContentSettingsMap* content_settings =

- profile->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(profile);

ContentSetting setting =

content_settings->GetContentSetting(document_url_,

document_url_,