| 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 2fdaaeabc89fb2608d6e93f2ccbd7398afef2c31..5954a6c62b739adfe05dea35d56e22696cb49d31 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -334,6 +334,16 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
| DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
|
| DCHECK(plugin_setting != CONTENT_SETTING_ASK);
|
|
|
| + if (*status ==
|
| + ChromeViewHostMsg_GetPluginInfo_Status::kFlashHiddenPreferHtml) {
|
| + if (plugin_setting == CONTENT_SETTING_BLOCK) {
|
| + *status = is_managed && !legacy_ask_user
|
| + ? ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy
|
| + : ChromeViewHostMsg_GetPluginInfo_Status::kBlockedNoLoading;
|
| + }
|
| + return;
|
| + }
|
| +
|
| #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
|
| // Check if the plugin is outdated.
|
| if (plugin_status == PluginMetadata::SECURITY_STATUS_OUT_OF_DATE &&
|
| @@ -455,6 +465,10 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
|
| // via chrome://plugins. That should be fine since chrome://plugins is
|
| // going away, but we should verify before launching HBD.
|
| *status = ChromeViewHostMsg_GetPluginInfo_Status::kFlashHiddenPreferHtml;
|
| +
|
| + // In the Prefer HTML case, the plugin is actually enabled, but hidden.
|
| + // It will still be blocked in the body of DecidePluginStatus.
|
| + enabled = true;
|
| }
|
| }
|
|
|
|
|