Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5365)

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.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:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698