chrome/browser/plugins/plugins_field_trial.h - 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/plugins_field_trial.h

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/plugins_field_trial.h

diff --git a/chrome/browser/plugins/plugins_field_trial.h b/chrome/browser/plugins/plugins_field_trial.h

index 71da9e3122465a912dd919ac7509c78168cd8ccf..83ae04c23bf998d06383d343abc6f9fab8b75a74 100644

--- a/chrome/browser/plugins/plugins_field_trial.h

+++ b/chrome/browser/plugins/plugins_field_trial.h

@@ -21,8 +21,10 @@ class PluginsFieldTrial {

// Returns the effective content setting for plugins. Passes non-plugin

// content settings through without modification.

- static ContentSetting EffectiveContentSetting(ContentSettingsType type,

- ContentSetting setting);

+ static ContentSetting EffectiveContentSetting(

+ const HostContentSettingsMap* host_content_settings_map,

+ ContentSettingsType type,

+ ContentSetting setting);

// Returns the engagement cutoff for permitting Flash to run without a prompt.

static double GetSiteEngagementThresholdForFlash();