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

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_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_bubble_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 15497a2b6a28979b0f3dda7b6d558d90e108fd38..077761946b652adccdd5e8a1af6fa2be028068df 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/permissions/permission_uma_util.h"
#include "chrome/browser/permissions/permission_util.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
+#include "chrome/browser/plugins/plugin_utils.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
#include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
@@ -202,7 +203,7 @@ void ContentSettingSimpleBubbleModel::SetCustomLink() {
// When Flash has been hidden from the plugin list, it is impossible to
// dynamically load all the plugins on the page.
if (setting == CONTENT_SETTING_BLOCK &&
- base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
+ PluginUtils::ShouldPreferHtmlOverPlugins(map)) {
return;
}
@@ -397,7 +398,8 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
bool flash_hidden_from_plugin_list =
content_type() == CONTENT_SETTINGS_TYPE_PLUGINS &&
setting == CONTENT_SETTING_BLOCK &&
- base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins);
+ PluginUtils::ShouldPreferHtmlOverPlugins(
+ HostContentSettingsMapFactory::GetForProfile(profile()));
set_radio_group_enabled(setting_source == SETTING_SOURCE_USER &&
!flash_hidden_from_plugin_list);

Powered by Google App Engine
This is Rietveld 408576698