| Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| index c217a955d43f8581b0ddffdcc65e927bf3b4b70f..f0fa20418246c7f123ffe06b45a696f6d0ed4d2a 100644
|
| --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| @@ -12,6 +12,8 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/browser_process.h"
|
| +#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
| +#include "chrome/browser/plugins/plugin_utils.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"
|
| #include "chrome/common/chrome_features.h"
|
| @@ -1286,7 +1288,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
|
| arraysize(localized_strings));
|
| }
|
|
|
| -void AddSiteSettingsStrings(content::WebUIDataSource* html_source) {
|
| +void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
|
| + Profile* profile) {
|
| LocalizedString localized_strings[] = {
|
| {"addSiteHeader", IDS_SETTINGS_ADD_SITE_HEADER},
|
| {"addSiteLink", IDS_SETTINGS_ADD_SITE_LINK},
|
| @@ -1471,7 +1474,8 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source) {
|
| AddLocalizedStringsBulk(html_source, localized_strings,
|
| arraysize(localized_strings));
|
|
|
| - if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
|
| + if (PluginUtils::ShouldPreferHtmlOverPlugins(
|
| + HostContentSettingsMapFactory::GetForProfile(profile))) {
|
| LocalizedString flash_strings[] = {
|
| {"siteSettingsFlashAskBefore",
|
| IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING},
|
| @@ -1688,7 +1692,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
| AddSearchEnginesStrings(html_source);
|
| AddSearchInSettingsStrings(html_source);
|
| AddSearchStrings(html_source);
|
| - AddSiteSettingsStrings(html_source);
|
| + AddSiteSettingsStrings(html_source, profile);
|
| #if !defined(OS_CHROMEOS)
|
| AddSystemStrings(html_source);
|
| #endif
|
|
|