| Index: chrome/browser/ui/content_settings/content_setting_image_model.cc
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
|
| index 06dbe10a8c0d74ab9b8bef90d2eec0dfb9b9d988..0dbc84527885d71944ddaa4506b9e4ef8aca0662 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
|
| +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
|
| @@ -10,6 +10,7 @@
|
| #include "build/build_config.h"
|
| #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
| #include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| +#include "chrome/browser/plugins/plugin_utils.h"
|
| #include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_features.h"
|
| @@ -227,10 +228,9 @@ void ContentSettingBlockedImageModel::UpdateFromWebContents(
|
| // For plugins, show the animated explanation in these cases:
|
| // - The plugin is blocked despite the user having content setting ALLOW.
|
| // - The user has disabled Flash using BLOCK and HTML5 By Default feature.
|
| - bool show_explanation =
|
| - setting == CONTENT_SETTING_ALLOW ||
|
| - (setting == CONTENT_SETTING_BLOCK &&
|
| - base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins));
|
| + bool show_explanation = setting == CONTENT_SETTING_ALLOW ||
|
| + (setting == CONTENT_SETTING_BLOCK &&
|
| + PluginUtils::ShouldPreferHtmlOverPlugins(map));
|
| if (!show_explanation)
|
| explanation_id = 0;
|
| }
|
|
|