| 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 b8cc37ac9de78d0a2b2f2b67da1187f76308789e..1d61fab50f78ac1a152f7fa75742f69d4006686e 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -367,7 +367,8 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
|
|
| if (plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ||
|
| (plugin_setting == CONTENT_SETTING_ALLOW &&
|
| - base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins))) {
|
| + base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) &&
|
| + !base::FeatureList::IsEnabled(features::kRunAllFlashInAllowMode))) {
|
| *status = ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent;
|
| } else if (plugin_setting == CONTENT_SETTING_BLOCK) {
|
| // For managed users with the ASK policy, we allow manually running plugins
|
|
|