chrome/browser/plugins/plugin_info_message_filter.cc - Issue 2408613002: Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi…

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 2408613002: Replace kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi… (Closed)

Patch Set: Replace remaining kPreferHtmlOverPlugins feature checks with PluginUtils::ShouldPreferHtmlOverPlugi… Created 4 years, 2 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 9f7cfc32e23a6415009bfc81fc934a8a18d45ba7..5ae1ef656604b21d7807ca974643d553e6b7c03f 100644

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

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

@@ -325,7 +325,8 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(

// TODO(tommycli): Remove once we deprecate the plugin ASK policy.

bool legacy_ask_user = plugin_setting == CONTENT_SETTING_ASK;

plugin_setting = PluginsFieldTrial::EffectiveContentSetting(

- CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);

+ host_content_settings_map_, CONTENT_SETTINGS_TYPE_PLUGINS,

+ plugin_setting);

DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);

DCHECK(plugin_setting != CONTENT_SETTING_ASK);