chrome/browser/plugins/plugin_utils.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_utils.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_utils.cc

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

index 77f79c2959056cf99f221addec29aaadad832788..344cfadc63be3345f685745b437accb6f797c0c8 100644

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

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

@@ -74,7 +74,7 @@ void GetPluginContentSettingInternal(

// For non-JavaScript treated plugins (Flash): unless the user has explicitly

// ALLOWed plugins, return BLOCK for any non-HTTP and non-FILE origin.

if (!use_javascript_setting && *setting != CONTENT_SETTING_ALLOW &&

- base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) &&

+ PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map) &&

!main_frame_url.SchemeIsHTTPOrHTTPS() && !main_frame_url.SchemeIsFile()) {

*setting = CONTENT_SETTING_BLOCK;

}