chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2682293002: Add desktop UI for the subresource filter content setting.

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2682293002: Add desktop UI for the subresource filter content setting. (Closed)

Patch Set: . Created 3 years, 9 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

« chrome/browser/resources/settings/privacy_page/privacy_page.html ('K') | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0f51a6d17f4e92f8c0cf71c0dbd97e04dd6a031c..a0cbc0f08c33082e3ab31f9235aa38c2ae1619c1 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

@@ -29,6 +29,7 @@

#include "components/password_manager/core/browser/password_manager_constants.h"

#include "components/safe_browsing_db/safe_browsing_prefs.h"

#include "components/strings/grit/components_strings.h"

+#include "components/subresource_filter/core/browser/subresource_filter_features.h"

#include "content/public/browser/web_ui_data_source.h"

#include "ui/base/l10n/l10n_util.h"

@@ -1758,6 +1759,9 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,

{"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},

{"siteSettingsSiteDetails", IDS_SETTINGS_SITE_DETAILS},

{"noSitesAdded", IDS_SETTINGS_SITE_NO_SITES_ADDED},

+ {"siteSettingsSubresourceFilter", IDS_SUBRESOURCE_FILTER_HEADER},

+ {"siteSettingsSubresourceFilterAllow", IDS_SUBRESOURCE_FILTER_ALLOW_RADIO},

+ {"siteSettingsSubresourceFilterBlock", IDS_SUBRESOURCE_FILTER_BLOCK_RADIO},

};

AddLocalizedStringsBulk(html_source, localized_strings,

arraysize(localized_strings));

@@ -1765,6 +1769,10 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,

html_source->AddBoolean("enableSiteSettings",

base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableSiteSettings));

+ html_source->AddBoolean(

+ "isSubresourceFilterVisible",

tommycli 2017/03/13 19:17:01 All our other switches are named: "showFooBar" or

melandory 2017/03/20 22:16:19 Done.

+ base::FeatureList::IsEnabled(

+ subresource_filter::kSafeBrowsingSubresourceFilterContentSetting));

if (PluginUtils::ShouldPreferHtmlOverPlugins(

HostContentSettingsMapFactory::GetForProfile(profile))) {