chrome/browser/pepper_broker_infobar_delegate.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/pepper_broker_infobar_delegate.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/pepper_broker_infobar_delegate.cc

diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc

index d7ec3d3001fa8afe5461327bb3eb8e643a062363..65f866f07e6562515e5841eb06494023d2b6d791 100644

--- a/chrome/browser/pepper_broker_infobar_delegate.cc

+++ b/chrome/browser/pepper_broker_infobar_delegate.cc

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

#include "chrome/browser/pepper_broker_infobar_delegate.h"

#include "base/prefs/pref_service.h"

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

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

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

#include "chrome/browser/plugins/plugin_finder.h"

@@ -44,7 +45,7 @@ void PepperBrokerInfoBarDelegate::Create(

TabSpecificContentSettings::FromWebContents(web_contents);

HostContentSettingsMap* content_settings =

- profile->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(profile);

ContentSetting setting =

content_settings->GetContentSetting(url, url,

CONTENT_SETTINGS_TYPE_PPAPI_BROKER,