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

Unified Diff: chrome/browser/ui/page_info/website_settings.cc

Issue 2682293002: Add desktop UI for the subresource filter content setting. (Closed)
Patch Set: comments 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
Download patch
Index: chrome/browser/ui/page_info/website_settings.cc
diff --git a/chrome/browser/ui/page_info/website_settings.cc b/chrome/browser/ui/page_info/website_settings.cc
index 61d4cdc1cf00c1c7099cfcbaccd0471777bd713b..8e571bdd7e0681000074eea8116a580008a718f4 100644
--- a/chrome/browser/ui/page_info/website_settings.cc
+++ b/chrome/browser/ui/page_info/website_settings.cc
@@ -56,6 +56,7 @@
#include "components/ssl_errors/error_info.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_strings.h"
+#include "components/subresource_filter/core/browser/subresource_filter_features.h"
#include "components/url_formatter/elide_url.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/user_metrics.h"
@@ -110,7 +111,7 @@ ContentSettingsType kPermissionType[] = {
CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
CONTENT_SETTINGS_TYPE_AUTOPLAY,
CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
-};
+ CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER};
msw 2017/03/23 18:18:08 nit: formatting (trailing comma, closing brace on
melandory 2017/03/23 20:05:40 Done.
// Determines whether to show permission |type| in the Website Settings UI. Only
// applies to permissions listed in |kPermissionType|.
@@ -121,6 +122,11 @@ bool ShouldShowPermission(ContentSettingsType type) {
return false;
#endif
+ if (type == CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER) {
+ return base::FeatureList::IsEnabled(
+ subresource_filter::kSafeBrowsingSubresourceFilterContentSetting);
+ }
+
return true;
}

Powered by Google App Engine
This is Rietveld 408576698