chrome/browser/plugins/plugin_info_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/plugins/plugin_info_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:

Index: chrome/browser/plugins/plugin_info_message_filter.cc

diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc

index 46f6f50764f1f528d624fa7d012a6069e430153f..8c33164b56019322c64e4d6d4d3929a6a3f63699 100644

--- a/chrome/browser/plugins/plugin_info_message_filter.cc

+++ b/chrome/browser/plugins/plugin_info_message_filter.cc

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

#include "base/strings/utf_string_conversions.h"

#include "base/thread_task_runner_handle.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

@@ -192,7 +193,8 @@ PluginInfoMessageFilter::Context::Context(int render_process_id,

#if defined(ENABLE_EXTENSIONS)

extension_registry_(extensions::ExtensionRegistry::Get(profile)),

#endif

- host_content_settings_map_(profile->GetHostContentSettingsMap()),

+ host_content_settings_map_(HostContentSettingsMapFactory::GetForProfile(

+ profile)),

plugin_prefs_(PluginPrefs::GetForProfile(profile)) {

allow_outdated_plugins_.Init(prefs::kPluginsAllowOutdated,

profile->GetPrefs());